summaryrefslogtreecommitdiffstats
path: root/src/winmain/CMakeLists.txt
Commit message (Collapse)AuthorAgeFilesLines
* Remove winrtOliver Wolff2020-06-061-5/+1
| | | | | | | | | Macros and the await helper function from qfunctions_winrt(_p).h are needed in other Qt modules which use UWP APIs on desktop windows. Task-number: QTBUG-84434 Change-Id: Ice09c11436ad151c17bdccd2c7defadd08c13925 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* Fix qmake builds of Windows applications against a CMake-built QtJoerg Bornemann2020-05-271-0/+3
| | | | | | | | | | | | | | | QMake's windows.prf expects the WinMain library to be named 'qtmain[d].lib' and not 'Qt6WinMain[d].lib'. We're renaming the library to 'qtmain[d].lib' in the CMake build now to avoid adjusting the qmake build of Qt. Also, we have to add the private library shell32.lib to WinMain to make it appear in qtmain.prl and having it linked to Windows GUI applications. Fixes: QTBUG-84425 Change-Id: Ia94090b89e037b17ebfded359b293c8586371d59 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate src/*Alexandru Croitor2019-11-141-4/+4
| | | | | | Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Annotate some projects that should not to be regeneratedAlexandru Croitor2019-10-081-0/+1
| | | | | | | Because they are completely custom written. Change-Id: I2f3d2e82ebf037a7bf42b3112fe4282589322b0e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Fix non-prefix builds on WindowsAlexandru Croitor2019-09-041-0/+1
| | | | | | | | | | | | Building qtdeclarative on Windows in a non-prefix build failed due to usage of include paths of WinMain that don't actually exist. Mark the library as not having include paths by setting NO_SYNC_QT. Change-Id: Ibdb420981069967414a119dedc7a7bfc9d61c253 Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Make WinMain linkage compatible with Qt 5Simon Hausmann2019-06-121-2/+0
| | | | | | | | | | | | | | | | | | | | In Qt 5, the Qt5Core target was extended by Qt5CoreConfigExtras.cmake to have a generator expression as interface linkage that would conditionally link WinMain. This patch implements the same through regular interface linkage right in corelib. Since the linkage happens through a generator expression, our dependency generator does not see this as a dependency. Therefore we add this as an unconditional package dependency for corelib, on Windows. In theory this could be done also in winmain's CMakeLists.txt, as targets can be extended outside of their directory. However this adds a directory id (WinMain:@<023423>) to the linkage, which mysteriously is not removed on the exported core target. Change-Id: If2abb9ba790f51274f582c9ec28c13d968b84302 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Qt CMake Build Bot
* CMake: Add WinMain supportCristian Adam2019-06-051-0/+28
Change-Id: I85c56555bc47dcf348daeb3435c621529aa2d381 Fixes: QTBUG-75195 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>