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 /qmake | |
| 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 'qmake')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 5 | ||||
| -rw-r--r-- | qmake/CMakeLists.txt | 4 |
2 files changed, 9 insertions, 0 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index 3c42a861ea..5381bea434 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -81,11 +81,16 @@ add_qt_executable(qmake property.cpp property.h qbytearray.cpp-NOTFOUND qbytearray.h-NOTFOUND qbytearraymatcher.cpp-NOTFOUND qbytearraymatcher.h-NOTFOUND + qcalendar.cpp-NOTFOUND qcalendar.h-NOTFOUND + qcalendarbackend_p.h-NOTFOUND + qcalendarmath_p.h-NOTFOUND qchar.h-NOTFOUND qdatetime.cpp-NOTFOUND qdatetime.h-NOTFOUND qdatetime_p.h-NOTFOUND + qgregoriancalendar.cpp-NOTFOUND qgregoriancalendar_p.h-NOTFOUND qlocale.cpp-NOTFOUND qlocale.h-NOTFOUND qlocale_tools.cpp-NOTFOUND qlocale_tools_p.h-NOTFOUND qregexp.cpp-NOTFOUND qregexp.h-NOTFOUND + qromancalendar.cpp-NOTFOUND qromancalendar_p.h-NOTFOUND qstring.cpp-NOTFOUND qstring.h-NOTFOUND qstringlist.cpp-NOTFOUND qstringlist.h-NOTFOUND qstringmatcher.h-NOTFOUND diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index e1e4b113c6..927fbdd1af 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -55,6 +55,10 @@ add_qt_tool(qmake # special case ../src/corelib/text/qbytearraymatcher.cpp ../src/corelib/text/qbytearraymatcher.h ../src/corelib/text/qchar.h ../src/corelib/tools/qcryptographichash.cpp ../src/corelib/tools/qcryptographichash.h + ../src/corelib/time/qcalendar.cpp ../src/corelib/time/qcalendar.h # special case + ../src/corelib/time/qcalendarbackend_p.h ../src/corelib/time/qcalendarmath_p.h # special case + ../src/corelib/time/qgregoriancalendar.cpp ../src/corelib/time/qgregoriancalendar_p.h # special case + ../src/corelib/time/qromancalendar.cpp ../src/corelib/time/qromancalendar_p.h # special case ../src/corelib/time/qdatetime.cpp ../src/corelib/time/qdatetime.h ../src/corelib/time/qdatetime_p.h # special case ../src/corelib/tools/qhash.cpp ../src/corelib/tools/qhash.h ../src/corelib/tools/qlist.cpp ../src/corelib/tools/qlist.h |