diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:26:34 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-06-03 15:51:20 +0200 |
| commit | 5591e821358b9111c79336a66eac4d04bb5811ba (patch) | |
| tree | 4b4c1da4f5ccaead1cf4f487622de1d0b242b0b9 /qmake/.prev_CMakeLists.txt | |
| parent | e4079eca49adce16e31dac2a18d49d7a55817891 (diff) | |
| parent | ca0c9f82cbf7c8c37acdcbdfdc3fa0c5fc138059 (diff) | |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Change-Id: Ide5b3408bfefca410323cf26b810b44c06d3a227
Diffstat (limited to 'qmake/.prev_CMakeLists.txt')
| -rw-r--r-- | qmake/.prev_CMakeLists.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt index f6b331b762..8a1aabc96f 100644 --- a/qmake/.prev_CMakeLists.txt +++ b/qmake/.prev_CMakeLists.txt @@ -56,7 +56,6 @@ add_qt_executable(qmake ../src/corelib/tools/qmap.cpp ../src/corelib/tools/qmap.h ../src/corelib/tools/qregexp.cpp ../src/corelib/tools/qregexp.h ../src/corelib/tools/qstring.cpp ../src/corelib/tools/qstring.h - ../src/corelib/tools/qstring_compat.cpp ../src/corelib/tools/qstringlist.cpp ../src/corelib/tools/qstringlist.h ../src/corelib/tools/qstringmatcher.h ../src/corelib/tools/qvector.h |