diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:49 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-08-21 02:32:50 +0200 |
| commit | 5a03b75c50b2e34552c7ec3e1e15e7b2a0128bf7 (patch) | |
| tree | 88e05cd6150e0b3cda4e8716668082c655007fb8 /tests/auto/cmake/CMakeLists.txt | |
| parent | 0e7724079f1eae283714ae12769d1372b8f85659 (diff) | |
| parent | 6553921dd537e416da2f4d1441ab6d63059cda60 (diff) | |
Merge dev into 5.12
Change-Id: I63f632b595f66d2fc93e9aa713500e3799e3df2a
Diffstat (limited to 'tests/auto/cmake/CMakeLists.txt')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index eac5b9976d..51d0d2879e 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -154,3 +154,4 @@ if (NOT CMAKE_VERSION VERSION_LESS 3.8) # /usr/bin/ld: CMakeFiles/mywidget.dir/moc_mywidget.cpp.o: previous definition here # Reason: SKIP_* properties were added in CMake 3.8 only expect_pass(test_QTBUG-63422) +endif() |