AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Consistently prefix all platform plugin libraries with "q".

Browse Source 
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>
This commit is contained in:
Samuel Rødal 2012-12-11 09:32:24 +01:00 committed by The Qt Project
parent c57f60ffa9
commit 2bf14740a7
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure vendored
View File

@ -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

2
src/plugins/platforms/qnx/qnx.pro
View File

@ -1,4 +1,4 @@
TARGET = qnx
TARGET = qqnx
QT += platformsupport platformsupport-private

2
src/plugins/platforms/windows/windows.pro
View File

@ -1,4 +1,4 @@
TARGET = windows
TARGET = qwindows
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QWindowsIntegrationPlugin

2
src/plugins/platforms/xcb/xcb-plugin.pro
View File

@ -1,4 +1,4 @@
TARGET = xcb
TARGET = qxcb
PLUGIN_TYPE = platforms
PLUGIN_CLASS_NAME = QXcbIntegrationPlugin

2
tools/configure/configureapp.cpp
View File

@ -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();