diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:19:14 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-06 16:50:03 +0200 |
| commit | 1326cd15f7ba985551f0fddc717e3bfc01ddda85 (patch) | |
| tree | 024eb871ed5f4e8c02e21412475e6e9929a2b030 /mkspecs/features/qt.prf | |
| parent | fe70367fe06984d1ac84cc276ca3fd3edc4193c7 (diff) | |
| parent | beb7258a56b6ec76531b73cc07ee30132a3f548f (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.cpp
src/opengl/qglpixelbuffer.cpp
src/opengl/qglshaderprogram.cpp
tests/auto/opengl/qglthreads/tst_qglthreads.cpp
Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
Diffstat (limited to 'mkspecs/features/qt.prf')
| -rw-r--r-- | mkspecs/features/qt.prf | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index a1eea2bef8..0830ed2c9b 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -163,6 +163,14 @@ contains(qt_module_deps, qml): \ } } +!import_qpa_plugin { + warning("CONFIG-=import_qpa_plugin is deprecated. Use QTPLUGIN.platforms=- instead.") + QTPLUGIN.platforms = - +} else: qpa_minimal_plugin { + warning("CONFIG+=qpa_minimal_plugin is deprecated. Use QTPLUGIN.platforms=qminimal instead.") + QTPLUGIN.platforms = qminimal +} + contains(TEMPLATE, .*app) { autoplugs = for (qtmod, qt_module_deps) { @@ -198,14 +206,6 @@ QT_PLUGIN_VERIFY = DEPLOYMENT_PLUGIN contains(QT_CONFIG, static) { QT_PLUGIN_VERIFY += QTPLUGIN force_import_plugins|contains(TEMPLATE, .*app) { - needs_qpa_plugin:import_qpa_plugin { - qpa_minimal_plugin: \ - QTPLUGIN += qminimal - else: \ - QTPLUGIN += $$QT_DEFAULT_QPA_PLUGIN - } - needs_printsupport_plugin: \ - QTPLUGIN += $$QT_DEFAULT_PRINTSUPPORTPLUGIN import_plugins:!isEmpty(QTPLUGIN) { IMPORT_FILE_CONT = \ "// This file is autogenerated by qmake. It imports static plugin classes for" \ |