diff options
| author | Samuel Rødal <samuel.rodal@digia.com> | 2012-12-11 09:32:24 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 13:37:57 +0100 |
| commit | 2bf14740a72eb3b85c887f85b1586515582319f7 (patch) | |
| tree | 035e5fe895790f6601156865692208566f12c79d | |
| parent | c57f60ffa9bf6ff77dfb3449a40420e15458f5ae (diff) | |
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>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/qnx/qnx.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/windows.pro | 2 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/xcb-plugin.pro | 2 | ||||
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
@@ -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 32dea13d52..8367513fc5 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 4f80d7739f..7f73465135 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 27fac3538f..20ec5701b9 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 2bb670dfd7..88f7acfb5b 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(); |