diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-18 10:53:22 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-04-18 10:53:22 (GMT) |
| commit | 6814998ab4d9c6b0990b0bf01119ace69363ce3e (patch) | |
| tree | d78cdbe4317b9705d88db7bfa7a27b13bd0764a9 /configure | |
| parent | a4d33d8c3cd206b982962014323abb673f5c64e3 (diff) | |
| parent | c4ae6d8464b9839729744e2710869947c0ec7bd0 (diff) | |
| download | Qt-6814998ab4d9c6b0990b0bf01119ace69363ce3e.zip Qt-6814998ab4d9c6b0990b0bf01119ace69363ce3e.tar.gz Qt-6814998ab4d9c6b0990b0bf01119ace69363ce3e.tar.bz2 | |
Merge branch 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse into master-integration
* 'staging-master' of scm.dev.nokia.troll.no:qt/qt-lighthouse:
Fix build for Apple gcc
Add platformNativeInterface assessor to QApplication
Lighthouse: Add dummy QSessionManager
Adapt to different uikit resolutions.
Lighthouse: Make directfb conform with ligthhouse gl context api
Compile fix for window surface features. (uikit)
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2873,7 +2873,7 @@ if [ -z "$PLATFORM" ]; then esac fi -if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then +if [ "$PLATFORM_QWS" = "yes" ]; then CFG_SM=no PLATFORMS=`find "$relpath/mkspecs/qws" | sed "s,$relpath/mkspecs/qws/,,"` else |