- rel 8; upstream fixes for QTBUGs

[packages/qt4.git] / qt4-tools.patch

diff --git a/qt4-tools.patch b/qt4-tools.patch
index 052442b9263b3ff8277703df4e21851b0a0f3b6e..0f9435d782c96a46833eef637a5e18fe47860031 100644 (file)
--- a/qt4-tools.patch
+++ b/qt4-tools.patch
@@ -1,11 +1,10 @@
---- qt-copy/tools/tools.pro.orig       2005-05-13 16:39:18.000000000 +0200
-+++ qt-copy/tools/tools.pro    2005-05-13 20:02:31.761482520 +0200
-@@ -7,7 +7,7 @@
-                       assistant \
-                       linguist \
-                       porting \
--                        qtestlib
-+                        qtestlib qvfb
-     !contains(QT_EDITION, Console):SUBDIRS += designer
-     unix:!embedded:SUBDIRS        += qtconfig
-     win32:!contains(QT_EDITION, OpenSource|Console):SUBDIRS       += activeqt
+--- qt-everywhere-opensource-src-4.7.0/tools/tools.pro.orig    2010-09-21 21:30:01.308429119 +0200
++++ qt-everywhere-opensource-src-4.7.0/tools/tools.pro 2010-09-21 21:30:39.836139945 +0200
+@@ -13,6 +13,7 @@
+                       pixeltool \
+                       porting \
+                       qtestlib \
++                    qvfb \
+                       qttracereplay
+             contains(QT_EDITION, Console) {
+                 SUBDIRS += designer/src/uitools     # Linguist depends on this