diff --git a/configure b/configure index 0ca47d72987b38dea6df6577b15c79c6561d1292..341f1977c5a62d8a1bdb42f629d3b866098c61a3 100755 --- a/configure +++ b/configure @@ -6027,7 +6027,7 @@ QT_NAMESPACE = $QT_NAMESPACE EOF if [ "$CFG_SHARED" = "no" ]; then - echo "QT_DEFAULT_QPA_PLUGIN = $QT_QPA_DEFAULT_PLATFORM" >> "$QTCONFIG.tmp" + echo "QT_DEFAULT_QPA_PLUGIN = q$QT_QPA_DEFAULT_PLATFORM" >> "$QTCONFIG.tmp" echo >> "$QTCONFIG.tmp" fi diff --git a/src/plugins/platforms/qnx/qnx.pro b/src/plugins/platforms/qnx/qnx.pro index 32dea13d526d8807b57a4f6c0c17185cc9825928..8367513fc53917d050161b009df3b7da9f36f72a 100644 --- a/src/plugins/platforms/qnx/qnx.pro +++ b/src/plugins/platforms/qnx/qnx.pro @@ -1,4 +1,4 @@ -TARGET = qnx +TARGET = qqnx QT += platformsupport platformsupport-private diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro index 4f80d7739fc9ab6347e87aa6362f04878f1f4a76..7f73465135deed00874d689215c30b0bd1f11b1b 100644 --- a/src/plugins/platforms/windows/windows.pro +++ b/src/plugins/platforms/windows/windows.pro @@ -1,4 +1,4 @@ -TARGET = windows +TARGET = qwindows PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro index 27fac3538fee539c0bae876271d48cf76eb7cd2b..20ec5701b941e1c5405b3e231f04dcbc5ec82254 100644 --- a/src/plugins/platforms/xcb/xcb-plugin.pro +++ b/src/plugins/platforms/xcb/xcb-plugin.pro @@ -1,4 +1,4 @@ -TARGET = xcb +TARGET = qxcb PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QXcbIntegrationPlugin diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 2bb670dfd7267d2ae2c7f02e5987c09037a109bb..88f7acfb5bc2d960a13df6012fb26297b08a8930 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -3100,7 +3100,7 @@ void Configure::generateQConfigPri() configStream << "#namespaces" << endl << "QT_NAMESPACE = " << dictionary["QT_NAMESPACE"] << endl; if (dictionary[ "SHARED" ] == "no") - configStream << "QT_DEFAULT_QPA_PLUGIN = " << qpaPlatformName() << endl; + configStream << "QT_DEFAULT_QPA_PLUGIN = q" << qpaPlatformName() << endl; configStream.flush(); configFile.close();