diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-02 11:54:36 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-07-02 15:35:17 +0200 |
| commit | c30e0c656f34815f7ba5fac33ce58baa421c4289 (patch) | |
| tree | cd17ff1ea7d3dd3ec335aef031c801aad13af08b /tests/auto | |
| parent | f6a07dfcb792f6311a1648d709759763ce6e4a3f (diff) | |
Update tests/auto/corelib/time/'s CMake config
Recent changes in .pro files hadn't been propagated.
Re-ran pro2cmake.py and saved the results.
Change-Id: I91e4cd513329bce10ce8cbd0ddae8240af050213
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/corelib/time/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdate/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qdatetime/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qtime/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | tests/auto/corelib/time/qtimezone/CMakeLists.txt | 3 |
5 files changed, 15 insertions, 1 deletions
diff --git a/tests/auto/corelib/time/CMakeLists.txt b/tests/auto/corelib/time/CMakeLists.txt index ed990d1979..b099b32469 100644 --- a/tests/auto/corelib/time/CMakeLists.txt +++ b/tests/auto/corelib/time/CMakeLists.txt @@ -4,4 +4,6 @@ add_subdirectory(qcalendar) add_subdirectory(qdate) add_subdirectory(qdatetime) add_subdirectory(qtime) -add_subdirectory(qtimezone) +if(QT_FEATURE_timezone) + add_subdirectory(qtimezone) +endif() diff --git a/tests/auto/corelib/time/qdate/CMakeLists.txt b/tests/auto/corelib/time/qdate/CMakeLists.txt index b39828b5df..2701fca6b8 100644 --- a/tests/auto/corelib/time/qdate/CMakeLists.txt +++ b/tests/auto/corelib/time/qdate/CMakeLists.txt @@ -7,6 +7,9 @@ add_qt_test(tst_qdate SOURCES tst_qdate.cpp + DEFINES + QT_NO_FOREACH + QT_NO_KEYWORDS PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qdatetime/CMakeLists.txt b/tests/auto/corelib/time/qdatetime/CMakeLists.txt index e992936e60..3b95ac279d 100644 --- a/tests/auto/corelib/time/qdatetime/CMakeLists.txt +++ b/tests/auto/corelib/time/qdatetime/CMakeLists.txt @@ -7,6 +7,9 @@ add_qt_test(tst_qdatetime SOURCES tst_qdatetime.cpp + DEFINES + QT_NO_FOREACH + QT_NO_KEYWORDS PUBLIC_LIBRARIES Qt::CorePrivate ) diff --git a/tests/auto/corelib/time/qtime/CMakeLists.txt b/tests/auto/corelib/time/qtime/CMakeLists.txt index ef224b45e3..d62858b6d0 100644 --- a/tests/auto/corelib/time/qtime/CMakeLists.txt +++ b/tests/auto/corelib/time/qtime/CMakeLists.txt @@ -7,4 +7,7 @@ add_qt_test(tst_qtime SOURCES tst_qtime.cpp + DEFINES + QT_NO_FOREACH + QT_NO_KEYWORDS ) diff --git a/tests/auto/corelib/time/qtimezone/CMakeLists.txt b/tests/auto/corelib/time/qtimezone/CMakeLists.txt index d95a2ac767..f723a8f880 100644 --- a/tests/auto/corelib/time/qtimezone/CMakeLists.txt +++ b/tests/auto/corelib/time/qtimezone/CMakeLists.txt @@ -7,6 +7,9 @@ add_qt_test(tst_qtimezone SOURCES tst_qtimezone.cpp + DEFINES + QT_NO_FOREACH + QT_NO_KEYWORDS PUBLIC_LIBRARIES Qt::CorePrivate ) |