diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-11 12:34:52 +0100 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-03-18 15:34:52 +0000 |
| commit | 3f03917b54ace1041f7a640dc65b452b0275fafc (patch) | |
| tree | cdeed63c0b1afcd906e07352b6e829fbaa9d7133 /qmake | |
| parent | 4f1a155909dfcba7353ebe9eee669d65336bd943 (diff) | |
Fix Windows build
- Fix qmake build
- Fix QtNetwork moc-ing, by including the moc files
inside the cpp files
- Fix sql odbc plugin by including QT_PLUGIN define
- Fix Boostrap to link against the Platform target, to get the
correct Unicode and WIN64 defines.
- Fix vulkan headers to be found
- Fix freetype bzip and png unresolved symbols / linker issues
when building minimal platform plugin (also need to make
sure to use the vcpkg toolchain instead of CMAKE_PREFIX_PATH
because then find_package is overridden, which does magic
to properly propagate static library dependencies).
- Fix qfilesystementry test not to be built without private
tests feature (it led to undefined symbols issues).
- Make sure to remove QT_NO_CAST_TO_ASCII define when building
QtCore, so that the qstringbuilder3 test builds
successfully.
Task-number: QTBUG-74140
Change-Id: I353d08392b604d55f8e62cdd8696d1e19a3c084a
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/CMakeLists.txt | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt index 14211480dd..dc4c88f2a5 100644 --- a/qmake/CMakeLists.txt +++ b/qmake/CMakeLists.txt @@ -134,6 +134,21 @@ extend_target(qmake CONDITION APPLE_OSX ${FWApplicationServices} ${FWCoreServices} ${FWFoundation} ) # TODO: Windows support, cf. qmake.pro +extend_target(qmake CONDITION WIN32 + SOURCES + ${PROJECT_SOURCE_DIR}/src/corelib/io/qfilesystemengine_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/io/qfilesystemiterator_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/io/qfsfileengine_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/tools/qlocale_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/global/qoperatingsystemversion_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/io/qsettings_win.cpp + ${PROJECT_SOURCE_DIR}/src/corelib/plugin/qsystemlibrary.cpp + generators/win32/registry.cpp + DEFINES + UNICODE _ENABLE_EXTENDED_ALIGNED_STORAGE _CRT_SECURE_NO_WARNINGS _SCL_SECURE_NO_WARNINGS + LIBRARIES + ole32 advapi32 kernel32 netapi32 +) set_target_properties(qmake PROPERTIES AUTOMOC OFF |