diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 15:53:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-07 15:53:19 (GMT) |
| commit | a9e66b3b7a469a8400915f22bb5ae75d60f3eed6 (patch) | |
| tree | 10aa32055188684ee6924bb6f9f7cd386c170116 /mkspecs | |
| parent | d7dd967d4a4775e70d270dbcd0623ef07128d420 (diff) | |
| parent | ffc4b43af90e5a4cb73ac2003a06f78c1d70d435 (diff) | |
| download | Qt-a9e66b3b7a469a8400915f22bb5ae75d60f3eed6.zip Qt-a9e66b3b7a469a8400915f22bb5ae75d60f3eed6.tar.gz Qt-a9e66b3b7a469a8400915f22bb5ae75d60f3eed6.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: (61 commits)
Merge faba550d704312a29d9485bcaaa506331f102301 from 4.7 to master.
Minor OpenVG optimization when setting the EGL surface attribute.
Make sure the QS60PaintEngine can draw other classes of pixmap data
Fix failure on Windows after commit ccd3f66
tst_qtcpserver: Another attempt to reproduce QTBUG-14268
Fix crash when constructing QThreadStorage after global destructors have run
tst_qtcpsocket: Attempt to reproduce QTBUG-14268
Fixed a buffer overrun when pasting large data from non-Qt apps
Fix copying large data to non-Qt applications
fix regexp in "make custom command handling in vc(x)proj files sane"
Define QVG_SCISSOR_CLIP for QtOpenVG on Symbian.
Remove unused/incorrect TFX commands pertaining to layers on Symbian.
QS60Style: Highlighted TreeBranch indicator is incorrect
qmake: Include -pthread when reducing duplicate library arguments
qmake: Ensure right library order when reducing duplicate libraries
rebuild configure.exe
make QMAKE_POST_LINK handling in nmake generator sane
make custom command handling in vc(x)proj files sane
Revert "QWorkspace: fix hardcoded min size overwriting the real min size"
Adding a threshold for partial updates.
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/symbian_building.prf | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/mkspecs/features/symbian/symbian_building.prf b/mkspecs/features/symbian/symbian_building.prf index 539609d..614fb65 100644 --- a/mkspecs/features/symbian/symbian_building.prf +++ b/mkspecs/features/symbian/symbian_building.prf @@ -187,9 +187,11 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { linux-armcc: { QMAKE_LIBS += usrt2_2.lib dfpaeabi.dso dfprvct2_2.dso drtaeabi.dso scppnwdl.dso drtrvct2_2.dso h_t__uf.l\\(switch8.o\\) QMAKE_LIBS += -leexe.lib\\(uc_exe_.o\\) - contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore + QMAKE_LIBS -= -lqtmain$${QT_LIBINFIX}.lib QMAKE_LIBS += -lqtmain$${QT_LIBINFIX}.lib } else { + QMAKE_LIBS -= -llibcrt0.lib QMAKE_LIBS += -llibcrt0.lib } } else :linux-gcce { @@ -197,9 +199,12 @@ contains(TEMPLATE, app):!contains(QMAKE_LINK, "^@:.*") { QMAKE_LIBS += \ -l:eexe.lib \ -l:usrt2_2.lib - contains(CONFIG, "qt"):contains(QT, "core") { #if linking with QtCore + contains(CONFIG, "qt"):contains(QT, "gui") { #if linking with QtCore + QMAKE_LIBS -= -l:qtmain$${QT_LIBINFIX}.lib QMAKE_LIBS += -l:qtmain$${QT_LIBINFIX}.lib } else { + QMAKE_LIBS -= -l:libcrt0.lib + QMAKE_LIBS -= -l:libcrt0_gcce.lib QMAKE_LIBS += -l:libcrt0_gcce.lib } QMAKE_LIBS += \ |