diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 06:22:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-27 06:22:27 (GMT) |
| commit | 39e6aa3f4434ab31d3d862574aa505b3f946ee9b (patch) | |
| tree | 6fce21967f33402b3c06d7e1b6b4a8368f955aab /mkspecs/common | |
| parent | 69c9b5b45393ebd2e2e50f1bb316cf4fc8ee9b73 (diff) | |
| parent | 4c263772fa92cb270e32d5b1519b278f780f2635 (diff) | |
| download | Qt-39e6aa3f4434ab31d3d862574aa505b3f946ee9b.zip Qt-39e6aa3f4434ab31d3d862574aa505b3f946ee9b.tar.gz Qt-39e6aa3f4434ab31d3d862574aa505b3f946ee9b.tar.bz2 | |
Merge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into master-integration
* 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (79 commits)
configure: fixed configure on mac.
Add util/xkbdatagen/README
Application background is incorrect if app locked to landscape.
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Revert "QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap"
Temporary fix for ambiguous cast from four letter char constant
add autotest for digest authentication
Fix cursor position adjustment when removing strings
Fix QMAKE_POST_LINK in Symbian for targets with special characters.
QtScript/JSC on Symbian: Enhanced memory allocator for Collector heap
Improved performance of mapFromGlobal/mapToGlobal on X11
Moved the implementation of mapFromGlobal/mapToGlobal to QWidgetPrivate
Avoid possible font name collisions on fbserv
Update of Czech translation for Qt 4.7-stable
Fix crash in QtScript/JSC stack allocator on Symbian
HTTP: fix digest authentication
Fix loop count in animanted gifs sometimes being incorrect
Fixed UTF-8 application names in device application menu in Symbian
Validate arguments to QDBusConnection::connect
make the test a bit stricter
...
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/symbian/symbian-makefile.conf | 3 | ||||
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/common/symbian/symbian-makefile.conf b/mkspecs/common/symbian/symbian-makefile.conf index 9dc3674..a69b224 100644 --- a/mkspecs/common/symbian/symbian-makefile.conf +++ b/mkspecs/common/symbian/symbian-makefile.conf @@ -22,11 +22,8 @@ QMAKE_ELF2E32_FLAGS = --dlldata \ include(../../common/unix.conf) QMAKE_PREFIX_SHLIB = -QMAKE_EXTENSION_SHLIB = dll CONFIG *= no_plugin_name_prefix -QMAKE_EXTENSION_PLUGIN = dll QMAKE_PREFIX_STATICLIB = -QMAKE_EXTENSION_STATICLIB = lib QMAKE_SYMBIAN_SHLIB = 1 is_using_gnupoc { diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 8f87d4c..37bbb82 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -13,6 +13,9 @@ QMAKE_COMPILER_DEFINES += SYMBIAN QMAKE_EXT_OBJ = .o QMAKE_EXT_RES = _res.o +QMAKE_EXTENSION_SHLIB = dll +QMAKE_EXTENSION_PLUGIN = dll +QMAKE_EXTENSION_STATICLIB = lib QMAKE_LEX = flex QMAKE_LEXFLAGS = |