... and ditch all patches that are no longer necessary, a sane build at last
This commit is contained in:
parent
9e9af894ce
commit
06da7a8b6d
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-demos_arthurplugin_arthurplugin_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- demos/arthurplugin/arthurplugin.pro.orig Sat Dec 31 14:06:26 2005
|
||||
+++ demos/arthurplugin/arthurplugin.pro Sat Dec 31 14:06:34 2005
|
||||
@@ -1,7 +1,8 @@
|
||||
|
||||
QTDIR = $$QT_SOURCE_TREE
|
||||
|
||||
-CONFIG += designer plugin debug_and_release
|
||||
+CONFIG += designer plugin
|
||||
+#CONFIG += designer plugin debug_and_release
|
||||
TEMPLATE = lib
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_designer_containerextension_containerextension_pro,v 1.1 2006/03/05 21:58:07 espie Exp $
|
||||
--- examples/designer/containerextension/containerextension.pro.orig Sun Mar 5 16:46:16 2006
|
||||
+++ examples/designer/containerextension/containerextension.pro Sun Mar 5 16:46:24 2006
|
||||
@@ -1,5 +1,6 @@
|
||||
TEMPLATE = lib
|
||||
-CONFIG += designer plugin debug_and_release
|
||||
+#CONFIG += designer plugin debug_and_release
|
||||
+CONFIG += designer plugin
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
|
||||
CONFIG(debug, debug|release) {
|
@ -1,10 +0,0 @@
|
||||
$OpenBSD: patch-examples_designer_customwidgetplugin_customwidgetplugin_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- examples/designer/customwidgetplugin/customwidgetplugin.pro.orig Sat Dec 31 14:40:33 2005
|
||||
+++ examples/designer/customwidgetplugin/customwidgetplugin.pro Sat Dec 31 14:40:41 2005
|
||||
@@ -1,4 +1,5 @@
|
||||
-CONFIG += designer plugin debug_and_release
|
||||
+CONFIG += designer plugin
|
||||
+#CONFIG += designer plugin debug_and_release
|
||||
TEMPLATE = lib
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
|
@ -1,11 +0,0 @@
|
||||
$OpenBSD: patch-examples_designer_taskmenuextension_taskmenuextension_pro,v 1.1 2006/03/05 21:58:07 espie Exp $
|
||||
--- examples/designer/taskmenuextension/taskmenuextension.pro.orig Sun Mar 5 22:18:18 2006
|
||||
+++ examples/designer/taskmenuextension/taskmenuextension.pro Sun Mar 5 22:18:34 2006
|
||||
@@ -1,5 +1,6 @@
|
||||
TEMPLATE = lib
|
||||
-CONFIG += designer plugin debug_and_release
|
||||
+#CONFIG += designer plugin debug_and_release
|
||||
+CONFIG += designer plugin
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
|
||||
CONFIG(debug, debug|release) {
|
@ -1,9 +0,0 @@
|
||||
$OpenBSD: patch-examples_designer_worldtimeclockplugin_worldtimeclockplugin_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro.orig Sat Dec 31 14:44:32 2005
|
||||
+++ examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro Sat Dec 31 14:44:43 2005
|
||||
@@ -1,4 +1,4 @@
|
||||
-CONFIG += designer plugin debug_and_release
|
||||
+CONFIG += designer plugin
|
||||
TEMPLATE = lib
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_plugins_qpluginbase_pri,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- src/plugins/qpluginbase.pri.orig Fri Dec 30 17:34:51 2005
|
||||
+++ src/plugins/qpluginbase.pri Fri Dec 30 17:35:01 2005
|
||||
@@ -1,7 +1,7 @@
|
||||
TEMPLATE = lib
|
||||
CONFIG += qt plugin
|
||||
|
||||
-!win32-msvc:!macx-xcode:CONFIG += debug_and_release
|
||||
+#!win32-msvc:!macx-xcode:CONFIG += debug_and_release
|
||||
!debug_and_release|build_pass {
|
||||
CONFIG(debug, debug|release): {
|
||||
unix:TARGET = $$member(TARGET, 0)_debug
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-src_qbase_pri,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- src/qbase.pri.orig Fri Dec 30 15:36:58 2005
|
||||
+++ src/qbase.pri Fri Dec 30 15:37:06 2005
|
||||
@@ -32,7 +32,7 @@ win32:DLLDESTDIR = $$[QT_INSTALL_PREFIX]
|
||||
CONFIG += qt warn_on depend_includepath
|
||||
CONFIG += qmake_cache target_qt
|
||||
CONFIG -= fix_output_dirs
|
||||
-!macx-xcode:CONFIG += debug_and_release
|
||||
+#!macx-xcode:CONFIG += debug_and_release
|
||||
|
||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
contains(QT_CONFIG, largefile):CONFIG += largefile
|
@ -1,10 +0,0 @@
|
||||
$OpenBSD: patch-tools_designer_src_components_component_pri,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- tools/designer/src/components/component.pri.orig Sat Dec 31 13:04:37 2005
|
||||
+++ tools/designer/src/components/component.pri Sat Dec 31 13:04:39 2005
|
||||
@@ -1,5 +1,5 @@
|
||||
|
||||
-CONFIG += debug_and_release
|
||||
+#CONFIG += debug_and_release
|
||||
contains(TEMPLATE,lib) {
|
||||
CONFIG(debug, debug|release) {
|
||||
unix:TARGET = $$member(TARGET, 0)_debug
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-tools_designer_src_components_lib_lib_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- tools/designer/src/components/lib/lib.pro.orig Sat Dec 31 13:45:41 2005
|
||||
+++ tools/designer/src/components/lib/lib.pro Sat Dec 31 13:45:55 2005
|
||||
@@ -1,7 +1,8 @@
|
||||
TEMPLATE = lib
|
||||
TARGET = QtDesignerComponents
|
||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
-CONFIG += qt debug_and_release depend_prl
|
||||
+CONFIG += qt depend_prl
|
||||
+#CONFIG += qt debug_and_release depend_prl
|
||||
DESTDIR = $$QT_BUILD_TREE/lib
|
||||
DLLDESTDIR = $$QT_BUILD_TREE/bin
|
||||
|
@ -1,13 +0,0 @@
|
||||
$OpenBSD: patch-tools_designer_src_lib_lib_pro,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- tools/designer/src/lib/lib.pro.orig Sat Dec 31 12:57:49 2005
|
||||
+++ tools/designer/src/lib/lib.pro Sat Dec 31 13:03:55 2005
|
||||
@@ -2,7 +2,8 @@ TEMPLATE=lib
|
||||
TARGET=QtDesigner
|
||||
QT += xml
|
||||
contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
|
||||
-CONFIG += qt debug_and_release
|
||||
+CONFIG += qt
|
||||
+#CONFIG += debug_and_release
|
||||
DESTDIR = ../../../../lib
|
||||
DLLDESTDIR = ../../../../bin
|
||||
|
@ -1,10 +0,0 @@
|
||||
$OpenBSD: patch-tools_designer_src_plugins_plugins_pri,v 1.1 2005/12/31 15:59:50 espie Exp $
|
||||
--- tools/designer/src/plugins/plugins.pri.orig Sat Dec 31 13:55:53 2005
|
||||
+++ tools/designer/src/plugins/plugins.pri Sat Dec 31 13:56:01 2005
|
||||
@@ -1,4 +1,5 @@
|
||||
-CONFIG += designer debug_and_release
|
||||
+CONFIG += designer
|
||||
+#CONFIG += designer debug_and_release
|
||||
DESTDIR = $$QT_BUILD_TREE/plugins/designer
|
||||
contains(TEMPLATE,lib) {
|
||||
CONFIG(debug, debug|release) {
|
Loading…
Reference in New Issue
Block a user