diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-10 16:50:25 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-14 08:49:24 +0000 |
| commit | b6e75ff3eaccc4f0322c9735533a1f3435597eba (patch) | |
| tree | e42f8adad0259624fa6f17713074265ebf16928d /tests/auto/corelib/tools/qlinkedlist | |
| parent | eba59bfd14d0ea29f36e80be81137d26cc67e23a (diff) | |
Regenerate qtbase after wip/qt6 -> wip/cmake merge
Note that android builds will be broken after this merge and
regeneration, because we don't currently handle the minimum required
changes that were brought in with the Android multi ABI support
that comes from 5.14.
This will have to be addressed in a separate change.
For now the build on Android will fail while compiling due to incorrect
generation of LIB_SUFFIX with QT_ARCH.
Change-Id: Ia4a871f4b7ddd0da11caf5f34e10a599a97bb55d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Qt CMake Build Bot
Diffstat (limited to 'tests/auto/corelib/tools/qlinkedlist')
| -rw-r--r-- | tests/auto/corelib/tools/qlinkedlist/.prev_CMakeLists.txt | 15 | ||||
| -rw-r--r-- | tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt | 4 |
2 files changed, 18 insertions, 1 deletions
diff --git a/tests/auto/corelib/tools/qlinkedlist/.prev_CMakeLists.txt b/tests/auto/corelib/tools/qlinkedlist/.prev_CMakeLists.txt new file mode 100644 index 0000000000..7124e17d17 --- /dev/null +++ b/tests/auto/corelib/tools/qlinkedlist/.prev_CMakeLists.txt @@ -0,0 +1,15 @@ +# Generated from qlinkedlist.pro. + +##################################################################### +## tst_qlinkedlist Test: +##################################################################### + +add_qt_test(tst_qlinkedlist + SOURCES + tst_qlinkedlist.cpp + DEFINES + -QT_NO_LINKED_LIST +) + +## Scopes: +##################################################################### diff --git a/tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt b/tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt index a2f7ec5e2e..2042739fa0 100644 --- a/tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt +++ b/tests/auto/corelib/tools/qlinkedlist/CMakeLists.txt @@ -5,9 +5,11 @@ ##################################################################### add_qt_test(tst_qlinkedlist - GUI SOURCES tst_qlinkedlist.cpp #DEFINES # special case remove #-QT_NO_LINKED_LIST # special case remove until fixed ) + +## Scopes: +##################################################################### |