SOURCES: qt4-debug-and-release.patch - updated for 4.1.1.

[pluto]

Author: pluto                        Date: Thu Feb 23 11:11:36 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 4.1.1.

---- Files affected:
SOURCES:
   qt4-debug-and-release.patch (1.4 -> 1.5) 

---- Diffs:

================================================================
Index: SOURCES/qt4-debug-and-release.patch
diff -u SOURCES/qt4-debug-and-release.patch:1.4 SOURCES/qt4-debug-and-release.patch:1.5
--- SOURCES/qt4-debug-and-release.patch:1.4	Mon Feb 20 15:47:57 2006
+++ SOURCES/qt4-debug-and-release.patch	Thu Feb 23 12:11:31 2006
@@ -1,58 +1,3 @@
---- qt-x11-opensource-src-4.1.0/configure.orig	2006-01-15 15:40:07.943555250 +0100
-+++ qt-x11-opensource-src-4.1.0/configure	2006-01-15 16:08:12.298554500 +0100
-@@ -370,7 +370,6 @@
- CFG_QCONFIG=full
- CFG_EMBEDDED=no
- CFG_DEBUG=auto
--CFG_BUILD_ALL=yes
- CFG_DEBUG_RELEASE=no
- CFG_SHARED=yes
- CFG_SM=auto
-@@ -1297,14 +1296,12 @@
- fi
- 
- # detect build style
--if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
--    QMAKE_CONFIG="$QMAKE_CONFIG build_all"
--elif [ "$CFG_DEBUG" = "auto" ]; then
-+if [ "$CFG_DEBUG" = "auto" ]; then
-     CFG_DEBUG_RELEASE=yes
-     CFG_DEBUG=yes
-+fi
-+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
-     QMAKE_CONFIG="$QMAKE_CONFIG build_all"
--else
--    CFG_BUILD_ALL=no
- fi
- 
- # if the source tree is different from the build tree,
-@@ -4168,7 +4165,16 @@
- 
- [ "$CFG_INCREMENTAL" = "yes" ] && [ '!' -z "$INCREMENTAL" ] && echo "Incremental ......... $INCREMENTAL"
- echo "Configuration ....... $QMAKE_CONFIG $QT_CONFIG"
--echo "Debug................ $CFG_DEBUG"
-+if [ "$CFG_DEBUG_RELEASE" = "yes" ]; then
-+   echo "Debug................ yes (combined)"
-+   if [ "$CFG_DEBUG" = "yes" ]; then
-+       echo "Default Link......... debug"
-+   else
-+       echo "Default Link......... release"
-+   fi
-+else
-+   echo "Debug................ $CFG_DEBUG"
-+fi
- echo "Qt3 compatibility.... $CFG_QT3SUPPORT"
- echo "STL support ......... $CFG_STL"
- echo "PCH support ......... $CFG_PRECOMPILE"
-@@ -4446,7 +4452,7 @@
- # WARNING: This makefile will be replaced with a real makefile.
- # All changes made to this file will be lost.
- EOF
--            [ "$CFG_BUILD_ALL" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
-+            [ "$CFG_DEBUG_RELEASE" = "no" ] && echo "first_target: first" >>${OUTDIR}/Makefile
-         
-             cat >>${OUTDIR}/Makefile <<EOF
- all clean install qmake first Makefile: FORCE
 --- qt-x11-opensource-src-4.1.0/src/qbase.pri.orig	2005-12-16 12:51:29.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/src/qbase.pri	2006-02-12 22:11:51.000000000 +0100
 @@ -32,7 +32,6 @@
@@ -143,6 +88,15 @@
  TEMPLATE    = lib
  DESTDIR     = $$QT_BUILD_TREE/plugins/designer
  
+--- qt-x11-opensource-src-4.1.1/examples/designer/containerextension/containerextension.pro.orig	2006-02-16 11:51:28.000000000 +0100
++++ qt-x11-opensource-src-4.1.1/examples/designer/containerextension/containerextension.pro	2006-02-23 12:01:07.461084000 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-CONFIG  += designer plugin debug_and_release
++CONFIG  += designer plugin
+ DESTDIR  = $$QT_BUILD_TREE/plugins/designer
+ 
+ CONFIG(debug, debug|release) {
 --- qt-x11-opensource-src-4.1.0/examples/designer/customwidgetplugin/customwidgetplugin.pro.orig	2005-12-16 12:52:13.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/examples/designer/customwidgetplugin/customwidgetplugin.pro	2006-02-13 00:16:43.000000000 +0100
 @@ -1,4 +1,4 @@
@@ -151,6 +105,15 @@
  TEMPLATE    = lib
  DESTDIR     = $$QT_BUILD_TREE/plugins/designer
  
+--- qt-x11-opensource-src-4.1.1/examples/designer/taskmenuextension/taskmenuextension.pro.orig	2006-02-16 11:51:28.000000000 +0100
++++ qt-x11-opensource-src-4.1.1/examples/designer/taskmenuextension/taskmenuextension.pro	2006-02-23 12:07:32.997178500 +0100
+@@ -1,5 +1,5 @@
+ TEMPLATE = lib
+-CONFIG  += designer plugin debug_and_release
++CONFIG  += designer plugin
+ DESTDIR  = $$QT_BUILD_TREE/plugins/designer
+ 
+ CONFIG(debug, debug|release) {
 --- qt-x11-opensource-src-4.1.0/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro.orig	2005-12-16 12:52:13.000000000 +0100
 +++ qt-x11-opensource-src-4.1.0/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro	2006-02-13 00:18:50.000000000 +0100
 @@ -1,4 +1,4 @@
@@ -159,3 +122,13 @@
  TEMPLATE    = lib
  DESTDIR     = $$QT_BUILD_TREE/plugins/designer
  
+--- qt-x11-opensource-src-4.1.1/tools/designer/src/uitools/uitools.pro.orig	2006-02-16 11:51:38.000000000 +0100
++++ qt-x11-opensource-src-4.1.1/tools/designer/src/uitools/uitools.pro	2006-02-23 12:11:12.242880500 +0100
+@@ -4,7 +4,6 @@
+ CONFIG += qt staticlib
+ DESTDIR = ../../../../lib
+ DLLDESTDIR = ../../../../bin
+-CONFIG += debug_and_release
+ CONFIG(debug, debug|release) {
+     unix:TARGET = $$member(TARGET, 0)_debug
+     else:TARGET = $$member(TARGET, 0)d
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/qt4-debug-and-release.patch?r1=1.4&r2=1.5&f=u