qt512.qtbase: fix new path used in header modules
This commit is contained in:
parent
f6e8dd8bad
commit
f43e0983c0
@ -65,6 +65,7 @@ let
|
|||||||
./qtbase.patch.d/0009-qtbase-tzdir.patch
|
./qtbase.patch.d/0009-qtbase-tzdir.patch
|
||||||
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
|
./qtbase.patch.d/0010-qtbase-qtpluginpath.patch
|
||||||
./qtbase.patch.d/0011-qtbase-assert.patch
|
./qtbase.patch.d/0011-qtbase-assert.patch
|
||||||
|
./qtbase.patch.d/0012-fix-header-module.patch
|
||||||
];
|
];
|
||||||
qtdeclarative = [ ./qtdeclarative.patch ];
|
qtdeclarative = [ ./qtdeclarative.patch ];
|
||||||
qtscript = [ ./qtscript.patch ];
|
qtscript = [ ./qtscript.patch ];
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
|
From 361a9395704ca1ee170a8bb3823ba860293eecee Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:34:00 -0500
|
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/common/mac.conf | 2 +-
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001
|
From 203c9338dc92c2c36007cfe6633387348976637e Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:37:15 -0500
|
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 ++++++++++++++--
|
src/corelib/kernel/qcore_mac_p.h | 16 ++++++++++++++--
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
|
From 8bdbddc2e5fef1553b1ba0297d3c03b38e9b947b Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Wed, 18 Sep 2019 05:39:39 -0500
|
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 ++++--------
|
mkspecs/features/create_cmake.prf | 53 ++++--------
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
|
From 492f6555bb09f207c83387441f0f23ba4602dfff Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Wed, 18 Sep 2019 05:39:50 -0500
|
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_common.prf | 20 ++------------------
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
|
From 6f53835deae80b28ec5c1c9a5c0294bbcc87f91b Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:34:28 -0500
|
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 +-
|
mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in | 2 +-
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001
|
From 5bf1785809baf6be7fb5904ce6cefdb761f2c278 Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:35:33 -0500
|
Date: Tue, 17 Sep 2019 05:35:33 -0500
|
||||||
Subject: [PATCH 06/11] qtbase-gtk3
|
Subject: [PATCH 06/12] qtbase-gtk3
|
||||||
|
|
||||||
---
|
---
|
||||||
src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++-
|
src/plugins/platformthemes/gtk3/main.cpp | 17 ++++++++++++++++-
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001
|
From 35e80f303ae6a6c4c53ba8eb3d84574cc03d68d8 Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:35:58 -0500
|
Date: Tue, 17 Sep 2019 05:35:58 -0500
|
||||||
Subject: [PATCH 07/11] qtbase-xcursor
|
Subject: [PATCH 07/12] qtbase-xcursor
|
||||||
|
|
||||||
---
|
---
|
||||||
src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
|
src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++--
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001
|
From b7c1c103ba04e76ae498f87ca9ef2c4e09e36d7e Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:36:10 -0500
|
Date: Tue, 17 Sep 2019 05:36:10 -0500
|
||||||
Subject: [PATCH 08/11] qtbase-xcompose
|
Subject: [PATCH 08/12] qtbase-xcompose
|
||||||
|
|
||||||
---
|
---
|
||||||
.../compose/generator/qtablegenerator.cpp | 5 +----
|
.../compose/generator/qtablegenerator.cpp | 5 +----
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001
|
From db9686362ae34e02538e449e0edfe3d61065b2e9 Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:36:25 -0500
|
Date: Tue, 17 Sep 2019 05:36:25 -0500
|
||||||
Subject: [PATCH 09/11] qtbase-tzdir
|
Subject: [PATCH 09/12] qtbase-tzdir
|
||||||
|
|
||||||
---
|
---
|
||||||
src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------
|
src/corelib/tools/qtimezoneprivate_tz.cpp | 20 ++++++++++++++------
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001
|
From a3aaebda6d4b302cd202c21e306c55d3715e9b0d Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:36:41 -0500
|
Date: Tue, 17 Sep 2019 05:36:41 -0500
|
||||||
Subject: [PATCH 10/11] qtbase-qtpluginpath
|
Subject: [PATCH 10/12] qtbase-qtpluginpath
|
||||||
|
|
||||||
---
|
---
|
||||||
src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
|
src/corelib/kernel/qcoreapplication.cpp | 9 +++++++++
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001
|
From 4f93027de0e9b825c4b7853d583e9b02a0443c6b Mon Sep 17 00:00:00 2001
|
||||||
From: Thomas Tuegel <ttuegel@mailbox.org>
|
From: Thomas Tuegel <ttuegel@mailbox.org>
|
||||||
Date: Tue, 17 Sep 2019 05:37:04 -0500
|
Date: Tue, 17 Sep 2019 05:37:04 -0500
|
||||||
Subject: [PATCH 11/11] qtbase-assert
|
Subject: [PATCH 11/12] qtbase-assert
|
||||||
|
|
||||||
---
|
---
|
||||||
src/testlib/qtestassert.h | 7 +++++--
|
src/testlib/qtestassert.h | 7 +++++--
|
||||||
|
@ -0,0 +1,25 @@
|
|||||||
|
From 7abf00d01ed0a3099cb2f5950c7ebc57a3960094 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Will Dietz <w@wdtz.org>
|
||||||
|
Date: Mon, 30 Sep 2019 20:15:40 -0500
|
||||||
|
Subject: [PATCH 12/12] fix header_module
|
||||||
|
|
||||||
|
---
|
||||||
|
mkspecs/features/qt_module.prf | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
|
||||||
|
index 9015b30d73..351a46227f 100644
|
||||||
|
--- a/mkspecs/features/qt_module.prf
|
||||||
|
+++ b/mkspecs/features/qt_module.prf
|
||||||
|
@@ -84,7 +84,7 @@ header_module {
|
||||||
|
CONFIG += qt_no_install_library
|
||||||
|
|
||||||
|
# Allow creation of .prl, .la and .pc files.
|
||||||
|
- target.path = $$[QT_INSTALL_LIBS]
|
||||||
|
+ target.path = $$NIXOS_OUTPUT_OUT/lib
|
||||||
|
target.CONFIG += dummy_install
|
||||||
|
INSTALLS += target
|
||||||
|
} else {
|
||||||
|
--
|
||||||
|
2.23.GIT
|
||||||
|
|
Loading…
x
Reference in New Issue
Block a user