Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

12 files changed, 38 insertions, 21 deletions

diff --git a/mkspecs/linux-cxx/qmake.conf b/mkspecs/linux-cxx/qmake.conf
index ff4a1979b..4dea9d16e 100644
--- a/mkspecs/linux-cxx/qmake.conf
+++ b/mkspecs/linux-cxx/qmake.conf
@@ -44,14 +44,14 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= cxx
 QMAKE_LINK_SHLIB	= cxx
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
 QMAKE_LFLAGS_PLUGIN	= $$QMAKE_LFLAGS_SHLIB
 QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-ecc-64/qmake.conf b/mkspecs/linux-ecc-64/qmake.conf
index 95842ae7f..8b31afe4d 100644
--- a/mkspecs/linux-ecc-64/qmake.conf
+++ b/mkspecs/linux-ecc-64/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= ecpc
 QMAKE_LINK_SHLIB	= ecpc
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Qoption,ld,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-32/qmake.conf b/mkspecs/linux-g++-32/qmake.conf
index c41659ca1..2602d3ce5 100644
--- a/mkspecs/linux-g++-32/qmake.conf
+++ b/mkspecs/linux-g++-32/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		= -m32
+QMAKE_LFLAGS		= -m32 -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-64/qmake.conf b/mkspecs/linux-g++-64/qmake.conf
index 84609f9f0..ba2d59a87 100644
--- a/mkspecs/linux-g++-64/qmake.conf
+++ b/mkspecs/linux-g++-64/qmake.conf
@@ -51,7 +51,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib64
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -60,7 +60,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++-sparc/qmake.conf b/mkspecs/linux-g++-sparc/qmake.conf
index bb7feb569..924666217 100644
--- a/mkspecs/linux-g++-sparc/qmake.conf
+++ b/mkspecs/linux-g++-sparc/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		=
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-g++/qmake.conf b/mkspecs/linux-g++/qmake.conf
index 42de9ea63..c89fdbe5a 100644
--- a/mkspecs/linux-g++/qmake.conf
+++ b/mkspecs/linux-g++/qmake.conf
@@ -48,7 +48,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= g++
 QMAKE_LINK_SHLIB	= g++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -57,7 +57,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Wl,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-icc/qmake.conf b/mkspecs/linux-icc/qmake.conf
index acde7cd5f..b414ccd7a 100644
--- a/mkspecs/linux-icc/qmake.conf
+++ b/mkspecs/linux-icc/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= icpc
 QMAKE_LINK_SHLIB	= icpc
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Qoption,ld,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -Qoption,ld,-rpath,
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-kcc/qmake.conf b/mkspecs/linux-kcc/qmake.conf
index e99e0500c..561735f84 100644
--- a/mkspecs/linux-kcc/qmake.conf
+++ b/mkspecs/linux-kcc/qmake.conf
@@ -53,7 +53,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= KCC
 QMAKE_LINK_SHLIB	= KCC
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	=
@@ -62,7 +62,7 @@ QMAKE_LFLAGS_SONAME	= --soname$$LITERAL_WHITESPACE
 QMAKE_LFLAGS_THREAD	= --thread_safe
 QMAKE_RPATH		= -rpath$$LITERAL_WHITESPACE
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/mkspecs/linux-kylix/qmake.conf b/mkspecs/linux-kylix/qmake.conf
index fe282d93c..018ae7964 100644
--- a/mkspecs/linux-kylix/qmake.conf
+++ b/mkspecs/linux-kylix/qmake.conf
@@ -45,7 +45,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= bc++
 QMAKE_LINK_SHLIB	= bc++
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	= -lv -ly
 QMAKE_LFLAGS_SHLIB	= -ltD -lTpd
@@ -54,7 +54,7 @@ QMAKE_LFLAGS_SONAME	= -lN
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		=
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -llibdl
 QMAKE_LIBS_X11		= -llibXext -llibX11 -llibm
 QMAKE_LIBS_X11SM	= -llibSM -llibICE
diff --git a/mkspecs/linux-pgcc/qmake.conf b/mkspecs/linux-pgcc/qmake.conf
index e5b7bc554..e45855d9d 100644
--- a/mkspecs/linux-pgcc/qmake.conf
+++ b/mkspecs/linux-pgcc/qmake.conf
@@ -46,7 +46,7 @@ QMAKE_LIBDIR_OPENGL	= /usr/X11R6/lib
 
 QMAKE_LINK		= pgCC
 QMAKE_LINK_SHLIB	= pgCC
-QMAKE_LFLAGS		=
+QMAKE_LFLAGS		= -luuid
 QMAKE_LFLAGS_RELEASE	=
 QMAKE_LFLAGS_DEBUG	=
 QMAKE_LFLAGS_SHLIB	= -shared
@@ -55,7 +55,7 @@ QMAKE_LFLAGS_SONAME	= -Wl,-soname,
 QMAKE_LFLAGS_THREAD	=
 QMAKE_RPATH		= -R
 
-QMAKE_LIBS		=
+QMAKE_LIBS		= -luuid
 QMAKE_LIBS_DYNLOAD	= -ldl
 QMAKE_LIBS_X11		= -lXext -lX11 -lm
 QMAKE_LIBS_X11SM	= -lSM -lICE
diff --git a/src/kernel/qpainter_x11.cpp b/src/kernel/qpainter_x11.cpp
index 0be2db0a5..f057e7b1f 100644
--- a/src/kernel/qpainter_x11.cpp
+++ b/src/kernel/qpainter_x11.cpp
@@ -1839,7 +1839,8 @@ void TQPainter::drawWinFocusRect( int x, int y, int w, int h,
     static char winfocus_line[] = { 1, 1 };
 
     TQPen     old_pen = cpen;
-    RasterOp old_rop = (RasterOp)rop;
+    TQBrush   old_brush = cbrush;
+    RasterOp  old_rop = (RasterOp)rop;
 
     if ( xorPaint ) {
         if ( TQColor::numBitPlanes() <= 8 )
@@ -1858,10 +1859,13 @@ void TQPainter::drawWinFocusRect( int x, int y, int w, int h,
         if ( testf(ExtDev) ) {
             TQPDevCmdParam param[1];
             TQRect r( x, y, w-1, h-1 );
+            TQBrush noBrush;
+            setBrush( noBrush );
             param[0].rect = &r;
             if ( !pdev->cmd( TQPaintDevice::PdcDrawRect, this, param ) || !hd) {
                 setRasterOp( old_rop );
                 setPen( old_pen );
+                setBrush( old_brush );
                 return;
             }
         }
diff --git a/src/tools/quuid.cpp b/src/tools/quuid.cpp
index 36472176a..11468a7ec 100644
--- a/src/tools/quuid.cpp
+++ b/src/tools/quuid.cpp
@@ -389,6 +389,18 @@ TQUuid TQUuid::createUuid()
     return result;
 }
 #else // !Q_OS_WIN32
+#if defined(Q_OS_LINUX)
+#include <uuid/uuid.h>
+TQUuid TQUuid::createUuid()
+{
+    uuid_t raw_uuid;
+    char uuid_string[37];
+
+    uuid_generate(raw_uuid);
+    uuid_unparse(raw_uuid, uuid_string);
+    return TQUuid(uuid_string);
+}
+#else // !Q_OS_LINUX
 #include "ntqdatetime.h"
 #include "stdlib.h" // For srand/rand
 TQUuid TQUuid::createUuid()
@@ -417,5 +429,6 @@ TQUuid TQUuid::createUuid()
 
     return result;
 }
+#endif // !Q_OS_LINUX
 #endif // !Q_OS_WIN32