diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:18:24 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-03 00:56:41 +0200 |
| commit | e6286ca289db11463d13ec4d31055995b32ad258 (patch) | |
| tree | 944bd3a2e93691bdd977ef7818b8241c1193d888 /mkspecs/macx-ios-clang | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
| parent | 9ae89313e43689483282ac330ad189db89bfcbba (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Manually fixed up: isES -> isOpenGLES
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
Change-Id: I57d2ef26c3d4a7b40ace09f4e8560b7686650ea5
Diffstat (limited to 'mkspecs/macx-ios-clang')
| -rw-r--r-- | mkspecs/macx-ios-clang/features/qt.prf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/macx-ios-clang/features/qt.prf b/mkspecs/macx-ios-clang/features/qt.prf index 04ebb1208a..a5b00377ee 100644 --- a/mkspecs/macx-ios-clang/features/qt.prf +++ b/mkspecs/macx-ios-clang/features/qt.prf @@ -15,7 +15,7 @@ equals(TEMPLATE, app):contains(QT, gui(-private)?) { # We do link and dependency resolution for the platform plugin # manually, since we know we always need the plugin, so we don't # need to generate an import for it. - CONFIG -= import_qpa_plugin + QTPLUGIN.platforms = - !no_main_wrapper { # We use ld to rename the _main symbol to _qt_main, so that we don't get a symbol clash |