diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 12:23:53 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 12:23:53 (GMT) |
| commit | b81201a29a9794ed490098c8eb136464afa12b8a (patch) | |
| tree | 7d7ad331c8c5316924bd5ff3fd7e6ccb21e7cc48 /mkspecs | |
| parent | 5243b9eaf3deb201f23b2710c274e3108a4eb23b (diff) | |
| parent | fde1488aa7476eba915fbac958c56664df8ecf82 (diff) | |
| download | Qt-b81201a29a9794ed490098c8eb136464afa12b8a.zip Qt-b81201a29a9794ed490098c8eb136464afa12b8a.tar.gz Qt-b81201a29a9794ed490098c8eb136464afa12b8a.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: (31 commits)
runonphone: Include USB serial ports on OS X for CODA, too
runonphone: Implement traceswitch support for coda
Fix missing clean up stack panic for a new thread in Symbian
Regression in QS60Style when drawing webview scrollbars
Cleanup qwidget_s60.cpp
Fix panic when global QSettings instance needs flusing at app exit
Fix uninitialised variable in temporary files
More accurately determine bearer type for symbian GPRS/3G
Add documentation for Symbian QSettings locations and security
Update QDesktopServices openUrl() documentation on Symbian OS
Mark binaries as SMPSAFE in Symbian
Fix "sbs -c tools2 --what" output for Qt.
Update environment.prf
QS60Style: Make spinboxes and lineedits slightly taller
runonphone: Add a missing space between a message and the file name
runonphone: Allow overriding the temporary sis file name
Fix QIcon auto-tests for Symbian
Add a cast to moc cpp generator to remove armcc warnings
Fix qt.conf for Symbian to use $${EPOCROOT}
Remove few unused variables.
...
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qttest_p4.prf | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/qttest_p4.prf b/mkspecs/features/qttest_p4.prf index ede9657..55df04a 100644 --- a/mkspecs/features/qttest_p4.prf +++ b/mkspecs/features/qttest_p4.prf @@ -11,6 +11,7 @@ symbian:{ # DEFINES += QTEST_NO_SPECIALIZATIONS TARGET.CAPABILITY="None" RSS_RULES ="group_name=\"QtTests\";" + MMP_RULES*=SMPSAFE } # prefix test binary with tst_ |