diff options
author | Janne Hamalainen <janne.a.hamalainen@nokia.com> | 2011-03-10 08:09:08 (GMT) |
---|---|---|
committer | Janne Hamalainen <janne.a.hamalainen@nokia.com> | 2011-03-10 08:09:08 (GMT) |
commit | d65cb0bbb17d21cce2823ace521dea9e53fe4988 (patch) | |
tree | bc1aac024a6587402c311d903f98327fde331495 /config.profiles/harmattan/patches/temppath.diff | |
parent | 8c25fc8fd3e54a30a03a2a8517e597e4cd26bf0d (diff) | |
download | Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.zip Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.tar.gz Qt-d65cb0bbb17d21cce2823ace521dea9e53fe4988.tar.bz2 |
Added Harmattan specific debian files to master branch.
Debian packaging files added to Master branch. One
translation file was removed as it was a left over from
an old commit. Reference to it was removed from rules file.
Similar commit is done for Harmattan as well. Task: BACKEND-564
Reviewed-by: Adrian Constantin
Diffstat (limited to 'config.profiles/harmattan/patches/temppath.diff')
-rw-r--r-- | config.profiles/harmattan/patches/temppath.diff | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/config.profiles/harmattan/patches/temppath.diff b/config.profiles/harmattan/patches/temppath.diff new file mode 100644 index 0000000..065c2d0 --- /dev/null +++ b/config.profiles/harmattan/patches/temppath.diff @@ -0,0 +1,28 @@ +Index: qt-maemo-qtp/mkspecs/linux-g++-maemo/qplatformdefs.h +=================================================================== +--- qt-maemo-qtp.orig/mkspecs/linux-g++-maemo/qplatformdefs.h ++++ qt-maemo-qtp/mkspecs/linux-g++-maemo/qplatformdefs.h +@@ -43,3 +43,8 @@ + + #define QT_GUI_DOUBLE_CLICK_RADIUS 20 + #define QT_GUI_DRAG_DISTANCE 16 ++ ++// TMPDIR sometimes points to /tmp and sometimes to /var/tmp ++// To guarantee native platform key generation for QSharedMemory and friends, ++// we must hard code the temp path to /var/tmp here. ++#define QT_UNIX_TEMP_PATH_OVERRIDE "/var/tmp" +Index: qt-maemo-qtp/src/corelib/io/qfsfileengine_unix.cpp +=================================================================== +--- qt-maemo-qtp.orig/src/corelib/io/qfsfileengine_unix.cpp ++++ qt-maemo-qtp/src/corelib/io/qfsfileengine_unix.cpp +@@ -643,7 +643,9 @@ + + QString QFSFileEngine::tempPath() + { +-#if defined(Q_OS_SYMBIAN) ++#if defined(QT_UNIX_TEMP_PATH_OVERRIDE) ++ QString temp = QLatin1String(QT_UNIX_TEMP_PATH_OVERRIDE); ++#elif defined(Q_OS_SYMBIAN) + TFileName symbianPath = PathInfo::PhoneMemoryRootPath(); + QString temp = QDir::fromNativeSeparators(qt_TDesC2QString(symbianPath)); + temp += QLatin1String( "temp/"); |