diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-11 13:24:57 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-06-17 16:40:06 +0200 |
| commit | 7a095bf6f7224e07fa1a28ab3021eb968019677f (patch) | |
| tree | 5c44dca0098266c0c3b9c65e41b4b2ede8961fd4 /tools | |
| parent | d28c625006c1b54fc3d39637a7b33e42fadb72a9 (diff) | |
Revert "CMake: Fix failing linux static build"
This workaround is not be needed anymore because the qtbase
workaround is merged and propagated to qtdeclarative.
The revert is also needed to make sure we don't break no-opengl
builds.
The qtbase workaround is 58a7e4f0bc5e9290cc205762d51adc5806b034fd.
This reverts commit b1913741148ec683637b1a8f9930a74a4c40ab0b.
Task-number: QTBUG-83498
Change-Id: I22af42f4b15fc27498fb9f171be1f1f0a06a8d69
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmleasing/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tools/qmltestrunner/CMakeLists.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/tools/qmleasing/CMakeLists.txt b/tools/qmleasing/CMakeLists.txt index 8d6359792e..a057e4c50c 100644 --- a/tools/qmleasing/CMakeLists.txt +++ b/tools/qmleasing/CMakeLists.txt @@ -15,7 +15,6 @@ 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 ab51d42a17..f1df677621 100644 --- a/tools/qmltestrunner/CMakeLists.txt +++ b/tools/qmltestrunner/CMakeLists.txt @@ -10,7 +10,6 @@ qt_add_tool(qmltestrunner SOURCES main.cpp PUBLIC_LIBRARIES - Qt::OpenGL # special case QTBUG-83498 Qt::Gui Qt::Qml Qt::QuickTest |