Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 41bfe6ff7bea
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 10f8c46e8e38
Choose a head ref
  • 7 commits
  • 15 files changed
  • 1 contributor

Commits on Oct 8, 2019

  1. qt5: 5.12.4 -> 5.12.5

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    b3594de View commit details

  2. qt5: regen patches for 5.12.5 (conflicts/attention needed: mkspecs-ma… 

    …c, replace-libdir)
    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    35b1361 View commit details

  3. qt5: revert mac qtbase patch to include recent change

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    f6e8dd8 View commit details

  4. qt512.qtbase: fix new path used in header modules

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    f43e098 View commit details

  5. qt5.qtbase: fix filename

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    d78a084 View commit details

  6. qt5: fix header_module variable typo

    @dtzWill
    dtzWill committed Oct 8, 2019
    Copy the full SHA
    792d6a9 View commit details

Commits on Oct 14, 2019

  1. Merge pull request #70689 from dtzWill/update/qt5-5.12.5 

    qt5: 5.12.4 -> 5.12.5
    @dtzWill
    dtzWill authored Oct 14, 2019
    Copy the full SHA
    10f8c46 View commit details
1 change: 1 addition & 0 deletions pkgs/development/libraries/qt-5/5.12/default.nix
View file
Original file line number Diff line number Diff line change
@@ -65,6 +65,7 @@ let
./qtbase.patch.d/0009-qtbase-tzdir.patch
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
./qtbase.patch.d/0011-qtbase-assert.patch
./qtbase.patch.d/0012-fix-header_module.patch
];
qtdeclarative = [ ./qtdeclarative.patch ];
qtscript = [ ./qtscript.patch ];
2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.12/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.4/submodules/ )
WGET_ARGS=( http://download.qt.io/official_releases/qt/5.12/5.12.5/submodules/ )
29 changes: 17 additions & 12 deletions pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0001-qtbase-mkspecs-mac.patch
View file
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
From 58d98b66da5d748d610f053053bd12e42c97d9e6 Mon Sep 17 00:00:00 2001
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:00 -0500
Subject: [PATCH 01/11] qtbase-mkspecs-mac
Subject: [PATCH 01/12] qtbase-mkspecs-mac

---
mkspecs/common/mac.conf | 2 +-
mkspecs/features/mac/default_post.prf | 196 --------------------------
mkspecs/features/mac/default_post.prf | 201 --------------------------
mkspecs/features/mac/default_pre.prf | 58 --------
mkspecs/features/mac/sdk.mk | 25 ----
mkspecs/features/mac/sdk.prf | 61 --------
5 files changed, 1 insertion(+), 341 deletions(-)
5 files changed, 1 insertion(+), 346 deletions(-)

diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf
index b77494ec..470c38e7 100644
index b77494ec9b..470c38e772 100644
--- a/mkspecs/common/mac.conf
+++ b/mkspecs/common/mac.conf
@@ -24,7 +24,7 @@ QMAKE_INCDIR_OPENGL = \
@@ -25,10 +25,10 @@ index b77494ec..470c38e7 100644

QMAKE_LFLAGS_REL_RPATH =
diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf
index c46222de..18dcfbce 100644
index 26bd3e2e98..b80ec1e801 100644
--- a/mkspecs/features/mac/default_post.prf
+++ b/mkspecs/features/mac/default_post.prf
@@ -64,202 +64,6 @@ qt {
@@ -68,207 +68,6 @@ qt {
}
}

@@ -212,6 +212,11 @@ index c46222de..18dcfbce 100644
- QMAKE_PCH_OUTPUT_EXT = _${QMAKE_PCH_ARCH}$${QMAKE_PCH_OUTPUT_EXT}
-}
-
-!equals(sdk_version, $$QMAKE_MAC_SDK_VERSION) {
- # Explicit SDK version has been set, respect that
- QMAKE_LFLAGS += -Wl,-sdk_version -Wl,$$sdk_version
-}
-
-cache(QMAKE_XCODE_DEVELOPER_PATH, stash)
-!isEmpty(QMAKE_XCODE_VERSION): \
- cache(QMAKE_XCODE_VERSION, stash)
@@ -229,10 +234,10 @@ index c46222de..18dcfbce 100644
-QMAKE_MAC_XCODE_SETTINGS += xcode_product_bundle_identifier_setting
-
!macx-xcode {
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode $(EXPORT__PRO_FILE_)
generate_xcode_project.commands = @$(QMAKE) -spec macx-xcode \"$(EXPORT__PRO_FILE_)\" $$QMAKE_ARGS
generate_xcode_project.target = xcodeproj
diff --git a/mkspecs/features/mac/default_pre.prf b/mkspecs/features/mac/default_pre.prf
index e3534561..3b01424e 100644
index e3534561a5..3b01424e67 100644
--- a/mkspecs/features/mac/default_pre.prf
+++ b/mkspecs/features/mac/default_pre.prf
@@ -1,60 +1,2 @@
@@ -297,7 +302,7 @@ index e3534561..3b01424e 100644
-xcode_copy_phase_strip_setting.value = NO
-QMAKE_MAC_XCODE_SETTINGS += xcode_copy_phase_strip_setting
diff --git a/mkspecs/features/mac/sdk.mk b/mkspecs/features/mac/sdk.mk
index c40f58c9..e69de29b 100644
index c40f58c987..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.mk
+++ b/mkspecs/features/mac/sdk.mk
@@ -1,25 +0,0 @@
@@ -327,7 +332,7 @@ index c40f58c9..e69de29b 100644
- endif
-endif
diff --git a/mkspecs/features/mac/sdk.prf b/mkspecs/features/mac/sdk.prf
index 3a9c2778..e69de29b 100644
index 3a9c2778bb..e69de29bb2 100644
--- a/mkspecs/features/mac/sdk.prf
+++ b/mkspecs/features/mac/sdk.prf
@@ -1,61 +0,0 @@
@@ -393,5 +398,5 @@ index 3a9c2778..e69de29b 100644
- cache($$tool_variable, set stash, $$tool)
-}
--
2.22.1
2.23.GIT

2 changes: 1 addition & 1 deletion pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0002-qtbase-mac.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:37:15 -0500
Subject: [PATCH 02/11] qtbase-mac
Subject: [PATCH 02/12] qtbase-mac

---
src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
34 changes: 17 additions & 17 deletions pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0003-qtbase-mkspecs.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 5ff996d9028c0f54939ca7c54d358cd7503ab1ae Mon Sep 17 00:00:00 2001
From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:39 -0500
Subject: [PATCH 03/11] qtbase-mkspecs
Subject: [PATCH 03/12] qtbase-mkspecs

---
mkspecs/features/create_cmake.prf | 53 ++++--------
@@ -18,7 +18,7 @@ Subject: [PATCH 03/11] qtbase-mkspecs
11 files changed, 39 insertions(+), 142 deletions(-)

diff --git a/mkspecs/features/create_cmake.prf b/mkspecs/features/create_cmake.prf
index c9910dda..e9bc8076 100644
index 00da9bd33f..bd166fbfea 100644
--- a/mkspecs/features/create_cmake.prf
+++ b/mkspecs/features/create_cmake.prf
@@ -21,7 +21,7 @@ load(cmake_functions)
@@ -30,7 +30,7 @@ index c9910dda..e9bc8076 100644
contains(CMAKE_INSTALL_LIBS_DIR, ^(/usr)?/lib(64)?.*): CMAKE_USR_MOVE_WORKAROUND = $$CMAKE_INSTALL_LIBS_DIR

CMAKE_OUT_DIR = $$MODULE_BASE_OUTDIR/lib/cmake
@@ -60,45 +60,20 @@ split_incpath {
@@ -70,45 +70,20 @@ split_incpath {
$$cmake_extra_source_includes.output
}

@@ -87,7 +87,7 @@ index c9910dda..e9bc8076 100644

static|staticlib:CMAKE_STATIC_TYPE = true

@@ -178,7 +153,7 @@ contains(CONFIG, plugin) {
@@ -188,7 +163,7 @@ contains(CONFIG, plugin) {
cmake_target_file

cmake_qt5_plugin_file.files = $$cmake_target_file.output
@@ -96,7 +96,7 @@ index c9910dda..e9bc8076 100644
INSTALLS += cmake_qt5_plugin_file

return()
@@ -323,7 +298,7 @@ exists($$cmake_macros_file.input) {
@@ -333,7 +308,7 @@ exists($$cmake_macros_file.input) {
cmake_qt5_module_files.files += $$cmake_macros_file.output
}

@@ -106,7 +106,7 @@ index c9910dda..e9bc8076 100644
# We are generating cmake files. Most developers of Qt are not aware of cmake,
# so we require automatic tests to be available. The only module which should
diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c7298928..c60ef16e 100644
index c729892889..c60ef16e64 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -3,30 +3,6 @@ if (CMAKE_VERSION VERSION_LESS 3.1.0)
@@ -266,7 +266,7 @@ index c7298928..c60ef16e 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/qml_module.prf b/mkspecs/features/qml_module.prf
index 57cfec78..5cbd7c52 100644
index 57cfec78b3..5cbd7c52ef 100644
--- a/mkspecs/features/qml_module.prf
+++ b/mkspecs/features/qml_module.prf
@@ -51,7 +51,7 @@ builtin_resources {
@@ -279,7 +279,7 @@ index 57cfec78..5cbd7c52 100644

qmlfiles.base = $$_PRO_FILE_PWD_
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf
index ad8ecdf5..804634b2 100644
index ad8ecdf5f1..804634b22e 100644
--- a/mkspecs/features/qml_plugin.prf
+++ b/mkspecs/features/qml_plugin.prf
@@ -50,7 +50,7 @@ load(qt_build_paths)
@@ -292,7 +292,7 @@ index ad8ecdf5..804634b2 100644

# Some final setup
diff --git a/mkspecs/features/qt_app.prf b/mkspecs/features/qt_app.prf
index 8354f30e..62028fef 100644
index 8354f30eea..62028fef8e 100644
--- a/mkspecs/features/qt_app.prf
+++ b/mkspecs/features/qt_app.prf
@@ -30,7 +30,7 @@ host_build:force_bootstrap {
@@ -305,7 +305,7 @@ index 8354f30e..62028fef 100644
}
INSTALLS += target
diff --git a/mkspecs/features/qt_build_paths.prf b/mkspecs/features/qt_build_paths.prf
index 3bb3823a..655b7b7d 100644
index 3bb3823a8e..655b7b7db8 100644
--- a/mkspecs/features/qt_build_paths.prf
+++ b/mkspecs/features/qt_build_paths.prf
@@ -24,6 +24,6 @@ exists($$MODULE_BASE_INDIR/.git): \
@@ -318,7 +318,7 @@ index 3bb3823a..655b7b7d 100644
+ MODULE_QMAKE_OUTDIR = $$NIX_OUTPUT_OUT
}
diff --git a/mkspecs/features/qt_docs.prf b/mkspecs/features/qt_docs.prf
index 3b74cd4d..6bfbbe6e 100644
index 3b74cd4dd5..6bfbbe6e2d 100644
--- a/mkspecs/features/qt_docs.prf
+++ b/mkspecs/features/qt_docs.prf
@@ -45,7 +45,7 @@ QMAKE_DOCS_OUTPUTDIR = $$QMAKE_DOCS_BASE_OUTDIR/$$QMAKE_DOCS_TARGETDIR
@@ -357,7 +357,7 @@ index 3b74cd4d..6bfbbe6e 100644
INSTALLS += inst_qch_docs

diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf
index 43b58817..e635b8f6 100644
index 43b58817fe..e635b8f67a 100644
--- a/mkspecs/features/qt_example_installs.prf
+++ b/mkspecs/features/qt_example_installs.prf
@@ -88,7 +88,7 @@ sourcefiles += \
@@ -370,7 +370,7 @@ index 43b58817..e635b8f6 100644

check_examples {
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf
index 1903e509..ae7b5859 100644
index 1903e509c8..ae7b585989 100644
--- a/mkspecs/features/qt_functions.prf
+++ b/mkspecs/features/qt_functions.prf
@@ -69,7 +69,7 @@ defineTest(qtHaveModule) {
@@ -383,7 +383,7 @@ index 1903e509..ae7b5859 100644
$${1}_EXE = $${cmd}.pl
cmd = perl -w $$system_path($${cmd}.pl)
diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf
index 1ebca173..b784441d 100644
index 1ebca17366..b784441da0 100644
--- a/mkspecs/features/qt_installs.prf
+++ b/mkspecs/features/qt_installs.prf
@@ -12,16 +12,10 @@
@@ -448,7 +448,7 @@ index 1ebca173..b784441d 100644
INSTALLS += privpritarget
}
diff --git a/mkspecs/features/qt_plugin.prf b/mkspecs/features/qt_plugin.prf
index 40528a65..903f7952 100644
index 40528a65e2..903f795284 100644
--- a/mkspecs/features/qt_plugin.prf
+++ b/mkspecs/features/qt_plugin.prf
@@ -88,7 +88,7 @@ CONFIG(static, static|shared)|prefix_build {
@@ -461,5 +461,5 @@ index 40528a65..903f7952 100644

TARGET = $$qt5LibraryTarget($$TARGET)
--
2.22.1
2.23.GIT

18 changes: 9 additions & 9 deletions pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0004-qtbase-replace-libdir.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
From d126db8f5c2c1f6d6738de1a53040c93fdf6ff73 Mon Sep 17 00:00:00 2001
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Wed, 18 Sep 2019 05:39:50 -0500
Subject: [PATCH 04/11] qtbase-replace-libdir
Subject: [PATCH 04/12] qtbase-replace-libdir

---
mkspecs/features/qt_common.prf | 20 ++------------------
mkspecs/features/qt_module.prf | 5 +----
2 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf
index caecb68a..d3aa3ba5 100644
index caecb68a84..d3aa3ba570 100644
--- a/mkspecs/features/qt_common.prf
+++ b/mkspecs/features/qt_common.prf
@@ -30,32 +30,16 @@ contains(TEMPLATE, .*lib) {
@@ -48,10 +48,10 @@ index caecb68a..d3aa3ba5 100644

# The remainder of this file must not apply to host tools/libraries,
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 51b5bde6..82e2907c 100644
index ee7de22059..9015b30d73 100644
--- a/mkspecs/features/qt_module.prf
+++ b/mkspecs/features/qt_module.prf
@@ -292,10 +292,7 @@ load(qt_targets)
@@ -303,10 +303,7 @@ load(qt_targets)
}
!lib_bundle:unix {
CONFIG += create_libtool
@@ -60,9 +60,9 @@ index 51b5bde6..82e2907c 100644
- else: \
- QMAKE_LIBTOOL_LIBDIR = "=$$[QT_INSTALL_LIBS/raw]"
+ QMAKE_LIBTOOL_LIBDIR = $$NIX_OUTPUT_OUT/lib
ltlib_replace.match = $$lib_replace.match
!isEmpty(lib_replace.replace): \
ltlib_replace.replace = $$QMAKE_LIBTOOL_LIBDIR
!isEmpty(lib_replace0.match) {
ltlib_replace0.match = $$lib_replace0.match
ltlib_replace0.replace = $$QMAKE_LIBTOOL_LIBDIR/
--
2.22.1
2.23.GIT

22 changes: 11 additions & 11 deletions pkgs/development/libraries/qt-5/5.12/qtbase.patch.d/0005-qtbase-cmake.patch
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
From 0ea804da2eb1d0cfbbfc15fbc33a3d7dd5de36ed Mon Sep 17 00:00:00 2001
From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
From: Thomas Tuegel <ttuegel@mailbox.org>
Date: Tue, 17 Sep 2019 05:34:28 -0500
Subject: [PATCH 05/11] qtbase-cmake
Subject: [PATCH 05/12] qtbase-cmake

---
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
@@ -15,7 +15,7 @@ Subject: [PATCH 05/11] qtbase-cmake
8 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
index c60ef16e..e354ab91 100644
index c60ef16e64..e354ab9156 100644
--- a/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in
@@ -278,7 +278,7 @@ if (NOT TARGET Qt5::$${CMAKE_MODULE_NAME})
@@ -28,7 +28,7 @@ index c60ef16e..e354ab91 100644
set_target_properties(Qt5::${Plugin} PROPERTIES
\"IMPORTED_LOCATION_${Configuration}\" ${imported_location}
diff --git a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
index 5baf0fdb..3583745a 100644
index 5baf0fdb10..3583745aea 100644
--- a/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
+++ b/mkspecs/features/data/cmake/Qt5PluginTarget.cmake.in
@@ -2,10 +2,10 @@
@@ -45,7 +45,7 @@ index 5baf0fdb..3583745a 100644

list(APPEND Qt5$${CMAKE_MODULE_NAME}_PLUGINS Qt5::$$CMAKE_PLUGIN_NAME)
diff --git a/src/corelib/Qt5CoreConfigExtras.cmake.in b/src/corelib/Qt5CoreConfigExtras.cmake.in
index e0652fdc..450b2a2d 100644
index e0652fdcf9..450b2a2d28 100644
--- a/src/corelib/Qt5CoreConfigExtras.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::qmake)
@@ -94,7 +94,7 @@ index e0652fdc..450b2a2d 100644
set(imported_location \"$${CMAKE_LIB_DIR}$${CMAKE_WINMAIN_FILE_LOCATION_DEBUG}\")
!!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
index c357237d..6f0c75de 100644
index c357237d0e..6f0c75de3c 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDir.cmake.in
@@ -1,6 +1,6 @@
@@ -106,7 +106,7 @@ index c357237d..6f0c75de 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_HOST_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
diff --git a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
index 706304cf..546420f6 100644
index 706304cf34..546420f6ad 100644
--- a/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
+++ b/src/corelib/Qt5CoreConfigExtrasMkspecDirForInstall.cmake.in
@@ -1,6 +1,6 @@
@@ -118,7 +118,7 @@ index 706304cf..546420f6 100644
set(_qt5_corelib_extra_includes \"$${CMAKE_INSTALL_DATA_DIR}mkspecs/$${CMAKE_MKSPEC}\")
!!ENDIF
diff --git a/src/dbus/Qt5DBusConfigExtras.cmake.in b/src/dbus/Qt5DBusConfigExtras.cmake.in
index 1d947159..b36865fc 100644
index 1d947159e2..b36865fc48 100644
--- a/src/dbus/Qt5DBusConfigExtras.cmake.in
+++ b/src/dbus/Qt5DBusConfigExtras.cmake.in
@@ -2,11 +2,7 @@
@@ -148,7 +148,7 @@ index 1d947159..b36865fc 100644

set_target_properties(Qt5::qdbusxml2cpp PROPERTIES
diff --git a/src/gui/Qt5GuiConfigExtras.cmake.in b/src/gui/Qt5GuiConfigExtras.cmake.in
index 84dbbfeb..8ad0720c 100644
index 84dbbfebd4..8ad0720c5c 100644
--- a/src/gui/Qt5GuiConfigExtras.cmake.in
+++ b/src/gui/Qt5GuiConfigExtras.cmake.in
@@ -2,7 +2,7 @@
@@ -177,7 +177,7 @@ index 84dbbfeb..8ad0720c 100644
set(imported_implib \"$${CMAKE_LIB_DIR}${IMPLIB_LOCATION}\")
!!ENDIF
diff --git a/src/widgets/Qt5WidgetsConfigExtras.cmake.in b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
index 99d87e2e..a4eab2aa 100644
index 99d87e2e46..a4eab2aa72 100644
--- a/src/widgets/Qt5WidgetsConfigExtras.cmake.in
+++ b/src/widgets/Qt5WidgetsConfigExtras.cmake.in
@@ -3,7 +3,7 @@ if (NOT TARGET Qt5::uic)
@@ -190,5 +190,5 @@ index 99d87e2e..a4eab2aa 100644
set(imported_location \"$${CMAKE_BIN_DIR}uic$$CMAKE_BIN_SUFFIX\")
!!ENDIF
--
2.22.1
2.23.GIT

Loading