diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 11:40:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-28 11:40:30 (GMT) |
| commit | 22b583438b8ef83535b0b94b695aba22a09cea2b (patch) | |
| tree | c648ebf5320465885f8c25114da8a90fd3e5be24 /mkspecs/features | |
| parent | 369f899e69362b2156800f8c90dfb0bdbe5f2598 (diff) | |
| parent | f5ff803e09ffbc73a1167d3f5a202af4a9767564 (diff) | |
| download | Qt-22b583438b8ef83535b0b94b695aba22a09cea2b.zip Qt-22b583438b8ef83535b0b94b695aba22a09cea2b.tar.gz Qt-22b583438b8ef83535b0b94b695aba22a09cea2b.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Add missign license headers.
Fix the compilation for tst_qabstractprintdialog and tst_qprinter on symbian.
Make link on linux/symbian
Fix double slashes on few data caging paths
Fix for QRuntimePixmapData serial number setting.
Enable QTouchEvent for S60 5.0
Add missing license header.
Fix build error on S60 3.1 environments
QRuntimeGraphicsSystem
Fix replacement functions in platform_paths.prf
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/symbian/data_caging_paths.prf | 4 | ||||
| -rw-r--r-- | mkspecs/features/symbian/platform_paths.prf | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/mkspecs/features/symbian/data_caging_paths.prf b/mkspecs/features/symbian/data_caging_paths.prf index ae9bc09..6b709cc 100644 --- a/mkspecs/features/symbian/data_caging_paths.prf +++ b/mkspecs/features/symbian/data_caging_paths.prf @@ -74,8 +74,8 @@ exists($${EPOCROOT}epoc32/include/data_caging_paths.prf) { BOOTDATA_DIR = /resource/bootdata } -isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins -isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = /$$RESOURCE_FILES_DIR/qt/imports +isEmpty(QT_PLUGINS_BASE_DIR): QT_PLUGINS_BASE_DIR = $$RESOURCE_FILES_DIR/qt$${QT_LIBINFIX}/plugins +isEmpty(QT_IMPORTS_BASE_DIR): QT_IMPORTS_BASE_DIR = $$RESOURCE_FILES_DIR/qt/imports isEmpty(HW_ZDIR): HW_ZDIR = epoc32/data/z isEmpty(REG_RESOURCE_DIR): REG_RESOURCE_DIR = /private/10003a3f/apps isEmpty(REG_RESOURCE_IMPORT_DIR): REG_RESOURCE_IMPORT_DIR = /private/10003a3f/import/apps
\ No newline at end of file diff --git a/mkspecs/features/symbian/platform_paths.prf b/mkspecs/features/symbian/platform_paths.prf index f05a885..0e8770d 100644 --- a/mkspecs/features/symbian/platform_paths.prf +++ b/mkspecs/features/symbian/platform_paths.prf @@ -473,5 +473,3 @@ exists($${EPOCROOT}epoc32/include/platform_paths.prf) { STLLIB_USAGE_DEFINES = _WCHAR_T_DECLARED } - -epocroot_prefix = |