diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 08:51:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-25 08:51:52 (GMT) |
| commit | df2e8fbe96fab8e034ab897b8a767b4a473b34ad (patch) | |
| tree | 578716637feeaeffaca8908c62a7c350aeef8e22 /mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf | |
| parent | 71bc8dc21687f1b15fc75a789f91753ace771b84 (diff) | |
| parent | 02e2ff4597a7fe81ecbb4b1ef3c5e4a5ac6b7339 (diff) | |
| download | Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.zip Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.tar.gz Qt-df2e8fbe96fab8e034ab897b8a767b4a473b34ad.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (120 commits)
Spelling fix
Fixed lost flushes in raster window surface.
Fix compilation of qjpeg on MinGW with GCC 4.6
uikit: Use correct pixmap data format.
Correctly position aliased lines with flat caps
Make the DBus timeout configurable in QDBusAbstractInterface.
Fix non-ascii name issues in ICD.
Compile fix for Symbian 5th and earlier
Improve documentation for QDeclarativeView::setSource()
fix copying webkit guide under windows
Add a QApplication::queryKeyboardModifiers() method.
Symbian: Fix backspace on empty lines of multiline textedits
Handle CloseSoftwareInputPanel event in QCoeFepInputContext
uikit: Fixes for Open GL ES 1 and for pre-3GS devices
uikit: Fix warning.
Use thumb instructions for uikit
Fix compilation with thumb2.
Update uikit README: svg works, warn about thumb
Fix delayed password masking mid-string.
Disabled splitscreen translation still moves screen
...
Diffstat (limited to 'mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf')
| -rw-r--r-- | mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf b/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf index de4c8b4..df8d4e8 100644 --- a/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf +++ b/mkspecs/qpa/macx-iphonesimulator-g++/qmake.conf @@ -23,7 +23,7 @@ DEFINES += QT_NO_AUDIO_BACKEND # You may need to change this to point to the iOS SDK you want to use. QMAKE_IOS_DEV_PATH = /Developer/Platforms/iPhoneSimulator.platform/Developer -QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneSimulator4.2.sdk +QMAKE_IOS_SDK = $$QMAKE_IOS_DEV_PATH/SDKs/iPhoneSimulator4.3.sdk # Set up deployment targets QMAKE_IPHONEOS_DEPLOYMENT_TARGET = 4.0 |