TDE
/
tqt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tqt3
0
0
Fork 0
Code Issues Releases Wiki Activity

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

Browse Source
pull/1/head
Darrell Anderson 12 years ago
parent 778e6b5965 4623775a22
commit 9ea2e3d893
12 changed files with 38 additions and 21 deletions
Show Stats Download Patch File Download Diff File

4
mkspecs/linux-cxx/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-ecc-64/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-g++-32/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-g++-64/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-g++-sparc/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-g++/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-icc/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-kcc/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-kylix/qmake.conf
Unescape View File

@ -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

4
mkspecs/linux-pgcc/qmake.conf
Unescape View File

@ -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

6
src/kernel/qpainter_x11.cpp
Unescape View File

@ -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;
}
}

13
src/tools/quuid.cpp
Unescape View File

@ -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

Write Preview
Loading…
Cancel
Save