diff options
Diffstat (limited to '0031-Hardcode-linker-flags-for-platform-plugins.patch')
-rw-r--r-- | 0031-Hardcode-linker-flags-for-platform-plugins.patch | 110 |
1 files changed, 110 insertions, 0 deletions
diff --git a/0031-Hardcode-linker-flags-for-platform-plugins.patch b/0031-Hardcode-linker-flags-for-platform-plugins.patch new file mode 100644 index 000000000000..807a40e7441f --- /dev/null +++ b/0031-Hardcode-linker-flags-for-platform-plugins.patch @@ -0,0 +1,110 @@ +From 299bb52899d3970ff33698305e4de8ae3ac26dae Mon Sep 17 00:00:00 2001 +From: Martchus <martchus@gmx.net> +Date: Wed, 25 Jan 2017 23:42:30 +0100 +Subject: [PATCH 31/32] Hardcode linker flags for platform plugins + +Otherwise incorrect order of libs leads to errors +when building libqminimal.dll, libqoffscreen.dll +and libqwindows.dll +--- + src/plugins/platforms/minimal/minimal.pro | 15 +++++++++++-- + src/plugins/platforms/offscreen/offscreen.pro | 14 ++++++++++-- + src/plugins/platforms/windows/windows.pro | 32 +++++++++++++++++++-------- + 3 files changed, 48 insertions(+), 13 deletions(-) + +diff --git a/src/plugins/platforms/minimal/minimal.pro b/src/plugins/platforms/minimal/minimal.pro +index 8cfb68824e..46834a71fc 100644 +--- a/src/plugins/platforms/minimal/minimal.pro ++++ b/src/plugins/platforms/minimal/minimal.pro +@@ -1,8 +1,19 @@ + TARGET = qminimal + + QT += \ +- core-private gui-private \ +- eventdispatcher_support-private fontdatabase_support-private ++ core-private gui-private ++ ++# Fix linker error when building libqminimal.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lfreetype -lole32 -lgdi32 -luuid ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} ++ + + DEFINES += QT_NO_FOREACH + +diff --git a/src/plugins/platforms/offscreen/offscreen.pro b/src/plugins/platforms/offscreen/offscreen.pro +index 6652cefd86..a322b17cc5 100644 +--- a/src/plugins/platforms/offscreen/offscreen.pro ++++ b/src/plugins/platforms/offscreen/offscreen.pro +@@ -1,8 +1,18 @@ + TARGET = qoffscreen + + QT += \ +- core-private gui-private \ +- eventdispatcher_support-private fontdatabase_support-private ++ core-private gui-private ++ ++# Fix linker error when building libqoffscreen.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lfreetype -lole32 -lgdi32 -luuid ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} + + DEFINES += QT_NO_FOREACH + +diff --git a/src/plugins/platforms/windows/windows.pro b/src/plugins/platforms/windows/windows.pro +index 174bc7b609..e66488e364 100644 +--- a/src/plugins/platforms/windows/windows.pro ++++ b/src/plugins/platforms/windows/windows.pro +@@ -1,14 +1,28 @@ + TARGET = qwindows + +-QT += \ +- core-private gui-private \ +- eventdispatcher_support-private \ +- fontdatabase_support-private theme_support-private +- +-qtConfig(accessibility): QT += accessibility_support-private +-qtConfig(vulkan): QT += vulkan_support-private +- +-LIBS += -lgdi32 -ldwmapi ++QT += core-private gui-private ++ ++# Fix linker error when building libqwindows.dll by specifying linker flags for ++# required modules manually (otherwise order is messed) ++LIBS += \ ++ -lQt5EventDispatcherSupport \ ++ -lQt5FontDatabaseSupport \ ++ -lQt5ThemeSupport \ ++ -lfreetype -lole32 -lgdi32 -ldwmapi ++# However, this workaround leads to the necessity of specifying include dirs manually ++INCLUDEPATH += \ ++ $$QT_SOURCE_TREE/include/QtEventDispatcherSupport/$${QT_VERSION} \ ++ $$QT_SOURCE_TREE/include/QtFontDatabaseSupport/$${QT_VERSION} \ ++ $$QT_SOURCE_TREE/include/QtThemeSupport/$${QT_VERSION} ++# Same for private support libs for accessibility and vulkan, if those are enabled ++qtConfig(accessibility) { ++ LIBS += -lQt5AccessibilitySupport ++ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtAccessibilitySupport/$${QT_VERSION} ++} ++qtConfig(vulkan) { ++ LIBS += -lQt5VulkanSupport ++ INCLUDEPATH += $$QT_SOURCE_TREE/include/QtVulkanSupport/$${QT_VERSION} ++} + + include(windows.pri) + +-- +2.16.1 + |