diff options
| author | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-16 10:42:05 +0100 |
|---|---|---|
| committer | Leander Beernaert <leander.beernaert@qt.io> | 2020-01-24 12:29:18 +0000 |
| commit | 48c82e90af12da74c713665ddfd7f8d825ae5bdb (patch) | |
| tree | 0efa87b0cd1b00c47fce0b566a7a0cbb35fed786 /tests/manual | |
| parent | 502d3d6744913899da87acfda5ebdab42c40329e (diff) | |
Post Merge Fixes
Change-Id: I1e06c01b76b119c3f23b6e6ecbaae8df719b70ce
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | tests/manual/qtabletevent/CMakeLists.txt | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/tests/manual/CMakeLists.txt b/tests/manual/CMakeLists.txt index 9d5a3effaa..34476f7ee7 100644 --- a/tests/manual/CMakeLists.txt +++ b/tests/manual/CMakeLists.txt @@ -9,13 +9,17 @@ endif() add_subdirectory(bearerex) add_subdirectory(filetest) -add_subdirectory(embeddedintoforeignwindow) -add_subdirectory(foreignwindows) +# special case begin +# diaglib is broken in dev due to missing +# QtOpenGL/QGLFunctions headers +# add_subdirectory(embeddedintoforeignwindow) +# add_subdirectory(foreignwindows) +# special case end add_subdirectory(gestures) add_subdirectory(highdpi) add_subdirectory(inputmethodhints) add_subdirectory(keypadnavigation) -add_subdirectory(lance) +#add_subdirectory(lance) # special case qgl.h missing add_subdirectory(qcursor) add_subdirectory(qdesktopservices) add_subdirectory(qdesktopwidget) diff --git a/tests/manual/qtabletevent/CMakeLists.txt b/tests/manual/qtabletevent/CMakeLists.txt index 06a0bab2d8..422664e2a4 100644 --- a/tests/manual/qtabletevent/CMakeLists.txt +++ b/tests/manual/qtabletevent/CMakeLists.txt @@ -1,5 +1,5 @@ # Generated from qtabletevent.pro. -add_subdirectory(device_information) +#add_subdirectory(device_information) # special case no member named 'staticQtMetaObject' add_subdirectory(event_compression) add_subdirectory(regular_widgets) |