diff options
author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2012-12-10 16:11:47 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-10 15:33:54 +0100 |
commit | 903fa2e4aa0d4e0cf0e13216dd8883b5e4a7709d (patch) | |
tree | 2b4a5deff813da0b1c81b26de2e3b348a2828243 /configure | |
parent | f166fcd3d0931ecc08087b12fdac5940e5ccbdf7 (diff) |
Add QT_DEFAULT_QPA_PLUGIN to generated qconfig.pri
Configure will now generate QT_DEFAULT_QPA_PLUGIN qmake variable
to specify the default QPA plugin.
"CONFIG += qpa_default_plugin" statement in application .pro file
will add the default QPA plugin into QTPLUGINS.
"CONFIG += qpa_minimal_plugin" statement in application .pro file
will add the minimal QPA plugin into QTPLUGINS.
Task-number: QTBUG-28131
Change-Id: I12a241005f30b37467d783b50f0369b47e605e68
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -6026,6 +6026,11 @@ QT_NAMESPACE = $QT_NAMESPACE EOF +if [ "$CFG_SHARED" = "no" ]; then + echo "QT_DEFAULT_QPA_PLUGIN = $QT_QPA_DEFAULT_PLATFORM" >> "$QTCONFIG.tmp" + echo >> "$QTCONFIG.tmp" +fi + if [ -n "$PKG_CONFIG_SYSROOT_DIR" ] || [ -n "$PKG_CONFIG_LIBDIR" ]; then echo "# pkgconfig" >> "$QTCONFIG.tmp" echo "PKG_CONFIG_SYSROOT_DIR = $PKG_CONFIG_SYSROOT_DIR" >> "$QTCONFIG.tmp" |