diff options
author | Armin Berres <armin.berres@basyskom.de> | 2010-04-15 15:59:52 +0200 |
---|---|---|
committer | Sergiy Dubovik <sergiy.dubovik@nokia.com> | 2010-04-16 12:04:58 +0300 |
commit | 609fdfd11a51ab6b337af3744c02ed4d84816055 (patch) | |
tree | 421e7ecf5f99664163483d608a5388232e24a182 | |
parent | 3bd42ba6dc68fceb9b5270418f8156c111443c85 (diff) |
Changes: define cache directory in pro files
RevBy: TrustMe
Details: The cache directories have been hardcoded in the sources so far,
but as they have a common prefix this should not happen.
The main problem ist that the cache dir for css files have been wrong
and mapplications therefor could not save the binary css files.
The prefix is not configurable via ./configure, I do not consider this
useful.
-rw-r--r-- | mkspecs/common.pri | 4 | ||||
-rw-r--r-- | src/corelib/style/mstylesheetparser.cpp | 2 | ||||
-rw-r--r-- | src/corelib/theme/mthemedaemon.cpp | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/mkspecs/common.pri b/mkspecs/common.pri index 3e749efa..f93d6293 100644 --- a/mkspecs/common.pri +++ b/mkspecs/common.pri @@ -74,6 +74,10 @@ include($${M_BUILD_TREE}/mkspecs/features/meegotouch_defines.prf) DEFINES += M_SHADER_BINARY_DIR=\\\"\"$$M_SHADER_BINARY_DIR\"\\\" } +unix { + DEFINES += CACHEDIR=\\\"\"/var/cache/meegotouch/\"\\\" +} + # Compiler configuration for all subprojects in libm !win32-msvc*:QMAKE_CXXFLAGS += -g diff --git a/src/corelib/style/mstylesheetparser.cpp b/src/corelib/style/mstylesheetparser.cpp index 92d15e67..c75930e1 100644 --- a/src/corelib/style/mstylesheetparser.cpp +++ b/src/corelib/style/mstylesheetparser.cpp @@ -866,7 +866,7 @@ MStyleSheetParser::MStyleSheetParser(const MLogicalValues *logicalValues) : Q_D(MStyleSheetParser); d->privateFileInfo = 0; #ifdef Q_WS_X11 - d->binaryDirectory = "/var/cache/m/css/"; + d->binaryDirectory = QString(CACHEDIR) + "css/"; #else d->binaryDirectory = QDir::tempPath() + QDir::separator(); #endif diff --git a/src/corelib/theme/mthemedaemon.cpp b/src/corelib/theme/mthemedaemon.cpp index d6f0636c..456c728d 100644 --- a/src/corelib/theme/mthemedaemon.cpp +++ b/src/corelib/theme/mthemedaemon.cpp @@ -77,7 +77,7 @@ QString MThemeDaemon::systemThemeDirectory() QString MThemeDaemon::systemThemeCacheDirectory() { #ifdef Q_WS_X11 - return "/var/cache/meegotouch/themedaemon"; + return QString(CACHEDIR) + "themedaemon/"; #else return QDir::tempPath(); #endif |