diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 13:05:51 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-05-01 13:08:42 +0200 |
| commit | ccc6efb6e91756451ffd50d51f7f3ae05bc6df0b (patch) | |
| tree | a65fb418e4e0ce27e6cd73f65500e7cc00bbf106 /mkspecs | |
| parent | d52b00e1d3cc60c81b54a89d6da488dc4bbce384 (diff) | |
| parent | 079f2bf5d8a4221b821ec8062affe2efaa9668a0 (diff) | |
Merge remote-tracking branch 'origin/release' into stable
This merge adds the opengl rename.
Change-Id: I84ea0b6abee9780ebb2cf3f64ab9e3fdf2acab3e
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/android-g++/qmake.conf | 2 | ||||
| -rw-r--r-- | mkspecs/features/qt.prf | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/mkspecs/android-g++/qmake.conf b/mkspecs/android-g++/qmake.conf index 608e64f3d4..78b484fdb5 100644 --- a/mkspecs/android-g++/qmake.conf +++ b/mkspecs/android-g++/qmake.conf @@ -3,7 +3,7 @@ MAKEFILE_GENERATOR = UNIX QMAKE_PLATFORM = android QMAKE_COMPILER = gcc -CONFIG += android_install unversioned_soname android_deployment_settings +CONFIG += android_install unversioned_soname unversioned_libname android_deployment_settings include(../common/linux.conf) include(../common/gcc-base-unix.conf) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 418b124a85..54423017ee 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,12 +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 - } import_plugins:!isEmpty(QTPLUGIN) { IMPORT_FILE_CONT = \ "// This file is autogenerated by qmake. It imports static plugin classes for" \ |