mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 20:37:50 +08:00
96f4487c77
* update to 5.12.4 * removed port qt5-modularscripts and split it functionality into more functions into qt5-base * added qt_port_hashes.cmake for simpler upgrade. * added optional VCPKG_QT_HOST_MKSPEC and VCPKG_QT_TARGET_MKSPEC to select QTs build mkspecs from a triplet * qt_<config>.conf are now copied from the build dir instead from the port dir * fixed freetype dependencies. * cleanup of vcpkg_qmake scripts. No strange/unclear replacements anymore. * introduced vcpkg_buildpath_length_warning * changed directory layout of the qt5 installation executables and mkspecs a bit.
14 lines
717 B
Diff
14 lines
717 B
Diff
diff --git a/mkspecs/features/win32/windows.prf b/mkspecs/features/win32/windows.prf
|
|
index 272170d4..70b8ea2e 100644
|
|
--- a/mkspecs/features/win32/windows.prf
|
|
+++ b/mkspecs/features/win32/windows.prf
|
|
@@ -6,7 +6,7 @@ contains(TEMPLATE, ".*app") {
|
|
|
|
qt:for(entryLib, $$list($$unique(QMAKE_LIBS_QT_ENTRY))) {
|
|
isEqual(entryLib, -lqtmain) {
|
|
- lib = $$QT.core.libs/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
|
|
+ lib = $$QT.core.libs/manual-link/$${QMAKE_PREFIX_STATICLIB}qtmain$$QT_LIBINFIX$$qtPlatformTargetSuffix().$$QMAKE_EXTENSION_STATICLIB
|
|
PRE_TARGETDEPS += $$lib
|
|
QMAKE_LIBS += $$lib
|
|
} else {
|