From 2bf14740a72eb3b85c887f85b1586515582319f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@digia.com>
Date: Tue, 11 Dec 2012 09:32:24 +0100
Subject: [PATCH] Consistently prefix all platform plugin libraries with "q".
This means the xcb plugin library will be named libqxcb.so instead of
libxcb.so, which doesn't clash with the system's libxcb.so. We need to
consistently apply this on all platforms for static linking to work.
Change-Id: I1640a7cae7b9846bbe62b19ab1c2c5bad7d02b4c
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
---
configure | 2 +-
src/plugins/platforms/qnx/qnx.pro | 2 +-
src/plugins/platforms/windows/windows.pro | 2 +-
src/plugins/platforms/xcb/xcb-plugin.pro | 2 +-
tools/configure/configureapp.cpp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 0ca47d72987..341f1977c5a 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 32dea13d526..8367513fc53 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 4f80d7739fc..7f73465135d 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 27fac3538fe..20ec5701b94 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 2bb670dfd72..88f7acfb5bc 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();
--
GitLab