diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-10 15:09:37 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-03-12 15:03:03 +0100 |
| commit | 26c5243491f495194f04b449128dae36118e28da (patch) | |
| tree | 7fb14678a6fc9e44a10c9224d005e2cbdc6bcb63 /tools/qmltestrunner | |
| parent | 1c7d264e3b2e9a2f0021786ea6967185f8282af0 (diff) | |
| parent | c24c5baeda4101b0058689adf9200b77a722c3a2 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
dependencies.yaml
src/qml/qml/qqmlengine.cpp
Change-Id: I6a73fd1064286f4a2232de85c2ce7f80452d4641
Diffstat (limited to 'tools/qmltestrunner')
| -rw-r--r-- | tools/qmltestrunner/main.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/tools/qmltestrunner/main.cpp b/tools/qmltestrunner/main.cpp index 687d6fbb01..2463757282 100644 --- a/tools/qmltestrunner/main.cpp +++ b/tools/qmltestrunner/main.cpp @@ -28,9 +28,6 @@ #include <QtQuickTest/quicktest.h> #include <QtCore/qstring.h> -#ifdef QT_OPENGL_LIB -#include <QtOpenGL/qgl.h> -#endif int main(int argc, char **argv) { |