Browse Source

contrib: qt: remove create_pc from patch

It is no longer needed here, as create_pc is added globally to CONFIG
using the qmake toolchain file.
pull/141/head
Johannes Kauffmann 4 years ago
committed by Jean-Baptiste Kempf
parent
commit
2a5b058dce
  1. 13
      contrib/src/qt/set-mkspecs-properties.patch

13
contrib/src/qt/set-mkspecs-properties.patch

@ -1,11 +1,9 @@
--- a/mkspecs/features/qml_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-08-31 10:58:10.110600024 +0200
@@ -12,7 +12,11 @@
load(qt_build_config)
@@ -13,6 +13,10 @@
TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin create_pc
CONFIG += plugin
+qmlprefixpclib_replace.match = $$dirname(_QMAKE_CONF_)
+qmlprefixpclib_replace.replace = $$[QT_INSTALL_PREFIX]
+qmlprefixpclib_replace.CONFIG = path
@ -15,12 +13,10 @@
qtConfig(debug_and_release): CONFIG += debug_and_release
--- a/mkspecs/features/qt_plugin.prf 2020-09-02 12:15:07.000000000 +0200
+++ b/mkspecs/features/qt_plugin.prf 2022-08-31 10:59:48.380662936 +0200
@@ -14,8 +14,12 @@
isEmpty(PLUGIN_TYPE): error("PLUGIN_TYPE (plugins/ subdirectory) needs to be defined.")
@@ -15,6 +15,10 @@
TEMPLATE = lib
-CONFIG += plugin
+CONFIG += plugin create_pc
CONFIG += plugin
+pluginpclib_replace.match = $$MODULE_BASE_OUTDIR/lib
+pluginpclib_replace.replace = $$[QT_INSTALL_LIBS]
+pluginpclib_replace.CONFIG = path
@ -28,7 +24,6 @@
DESTDIR = $$MODULE_BASE_OUTDIR/plugins/$$PLUGIN_TYPE
win32:CONFIG(shared, static|shared) {
# Embed a VERSIONINFO resource into the plugin's DLL.
--- a/mkspecs/features/qml_plugin.prf 2022-09-02 14:15:09.023765377 +0200
+++ b/mkspecs/features/qml_plugin.prf 2022-09-02 14:59:06.296938907 +0200
@@ -30,9 +30,9 @@

Loading…
Cancel
Save