diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 23:16:13 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-20 23:16:13 (GMT) |
| commit | 6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48 (patch) | |
| tree | 7d7ad331c8c5316924bd5ff3fd7e6ccb21e7cc48 /config.profiles/symbian/environment.prf | |
| parent | 7b4c273df2401505fe87efdf5d1d73d75993910a (diff) | |
| parent | b81201a29a9794ed490098c8eb136464afa12b8a (diff) | |
| download | Qt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.zip Qt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.tar.gz Qt-6e2a9ed7f5388ece10ffb08a52c3e22d3b058d48.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (36 commits)
add 4.8 changes created/merged by me
Fixed automatic plugin path resolving for predefined Qt plugins.
Resolve a number of compilation issues with INTEGRITY
runonphone: Include USB serial ports on OS X for CODA, too
Update changelog for Qt 4.8.0
Fix compile issue when building with QT_NO_CONCURRENT and QT_NO_FUTURE
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
...
Diffstat (limited to 'config.profiles/symbian/environment.prf')
| -rw-r--r-- | config.profiles/symbian/environment.prf | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/config.profiles/symbian/environment.prf b/config.profiles/symbian/environment.prf index 09ba90d..b9ab91e 100644 --- a/config.profiles/symbian/environment.prf +++ b/config.profiles/symbian/environment.prf @@ -4,6 +4,5 @@ CONFIG *= symbian_no_export_sqlite # STL autodetection in clean builds not working, specify it explicitly CONFIG *= stl - -S60_VERSION = 5.2 -SYMBIAN_VERSION = Symbian3
\ No newline at end of file +S60_VERSION = 5.4 +SYMBIAN_VERSION = 5.4 |