aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2020-06-11 12:19:51 +0200
committerAlexandru Croitor <alexandru.croitor@qt.io>2020-06-11 18:18:09 +0200
commit974c8da34d79cd8fc417ff5d69bc00c1e910e5ac (patch)
treeae6ef4ee1e27aa5e9a3b1bf07810493c19351e6f /tools
parent1ef4bed7eaa138074e79311549281310edf31762 (diff)
CMake: Fix failing linux static build
Use workaround to fix failing static builds due to wrong ordering of static libraries on the link line. This involves specifying some of the libraries in an explicitly correct order. See the bug report for more details. Task-number: QTBUG-83498 Change-Id: I2238a049bd315845df8ad8995d47dfe7e351a2c5 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Diffstat (limited to 'tools')
-rw-r--r--tools/qmleasing/CMakeLists.txt1
-rw-r--r--tools/qmltestrunner/CMakeLists.txt1
2 files changed, 2 insertions, 0 deletions
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt
index a057e4c50c..8d6359792e 100644
--- a/tools/qmleasing/CMakeLists.txt
+++ b/tools/qmleasing/CMakeLists.txt
@@ -15,6 +15,7 @@ qt_add_executable(qmleasing
segmentproperties.cpp segmentproperties.h
splineeditor.cpp splineeditor.h
PUBLIC_LIBRARIES
+ Qt::OpenGL # special case QTBUG-83498
Qt::Gui
Qt::Qml
Qt::Quick
diff --git a/tools/qmltestrunner/CMakeLists.txt b/tools/qmltestrunner/CMakeLists.txt
index f1df677621..ab51d42a17 100644
--- a/tools/qmltestrunner/CMakeLists.txt
+++ b/tools/qmltestrunner/CMakeLists.txt
@@ -10,6 +10,7 @@ qt_add_tool(qmltestrunner
SOURCES
main.cpp
PUBLIC_LIBRARIES
+ Qt::OpenGL # special case QTBUG-83498
Qt::Gui
Qt::Qml
Qt::QuickTest