Skip to content

Commit

Permalink
Revert "CMake: Fix failing linux static build"
Browse files Browse the repository at this point in the history
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 <[email protected]>
Reviewed-by: Laszlo Agocs <[email protected]>
  • Loading branch information
alcroito committed Jun 17, 2020
1 parent d28c625 commit 7a095bf
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 2 deletions.
1 change: 0 additions & 1 deletion tools/qmleasing/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion tools/qmltestrunner/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7a095bf

Please sign in to comment.