diff options
| author | Claudio Fantacci <claudiofantacci@users.noreply.github.com> | 2019-02-26 18:55:48 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-02-26 09:55:48 -0800 |
| commit | aa909090ace63e19ff738f3062e32c3b275a3da3 (patch) | |
| tree | b5c97eea51cd78568623afd0d93e4251bad40869 | |
| parent | 674ce6ad6558d6a5d95bf0ef7b20712cfdcb52cf (diff) | |
| download | vcpkg-aa909090ace63e19ff738f3062e32c3b275a3da3.tar.gz vcpkg-aa909090ace63e19ff738f3062e32c3b275a3da3.zip | |
Fix Qt5 hardcoded absolute paths within DLLs (#5456)
| -rw-r--r-- | ports/qt5-base/CONTROL | 8 | ||||
| -rw-r--r-- | ports/qt5-base/configure_qt.cmake | 20 |
2 files changed, 14 insertions, 14 deletions
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL index 28df38b4f..c17ac83c2 100644 --- a/ports/qt5-base/CONTROL +++ b/ports/qt5-base/CONTROL @@ -1,4 +1,4 @@ -Source: qt5-base -Version: 5.12.1 -Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components. -Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl +Source: qt5-base
+Version: 5.12.1-1
+Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
+Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl
diff --git a/ports/qt5-base/configure_qt.cmake b/ports/qt5-base/configure_qt.cmake index aa3fe4aff..b66f6d22e 100644 --- a/ports/qt5-base/configure_qt.cmake +++ b/ports/qt5-base/configure_qt.cmake @@ -32,11 +32,11 @@ function(configure_qt) -debug -prefix ${CURRENT_INSTALLED_DIR}/debug -extprefix ${CURRENT_PACKAGES_DIR}/debug - -hostbindir ${CURRENT_PACKAGES_DIR}/debug/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5/debug - -plugindir ${CURRENT_PACKAGES_DIR}/debug/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/debug/qml + -hostbindir ${CURRENT_INSTALLED_DIR}/debug/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5/debug + -plugindir ${CURRENT_INSTALLED_DIR}/debug/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/debug/qml -headerdir ${CURRENT_PACKAGES_DIR}/include -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/debug/lib @@ -53,11 +53,11 @@ function(configure_qt) -release -prefix ${CURRENT_INSTALLED_DIR} -extprefix ${CURRENT_PACKAGES_DIR} - -hostbindir ${CURRENT_PACKAGES_DIR}/tools/qt5 - -archdatadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -datadir ${CURRENT_PACKAGES_DIR}/share/qt5 - -plugindir ${CURRENT_PACKAGES_DIR}/plugins - -qmldir ${CURRENT_PACKAGES_DIR}/qml + -hostbindir ${CURRENT_INSTALLED_DIR}/tools/qt5 + -archdatadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -datadir ${CURRENT_INSTALLED_DIR}/share/qt5 + -plugindir ${CURRENT_INSTALLED_DIR}/plugins + -qmldir ${CURRENT_INSTALLED_DIR}/qml -I ${CURRENT_INSTALLED_DIR}/include -L ${CURRENT_INSTALLED_DIR}/lib -platform ${_csc_PLATFORM} |