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

Initial conversion for TQT_THREAD_SUPPORT->!TQT_NO_THREAD

Browse Source 
Signed-off-by: Alexander Golubev <fatzer2@gmail.com>
fix/no-thread
Alexander Golubev 2 months ago
parent 3ee3f6480f
commit fa4475f36d
24 changed files with 41 additions and 28 deletions
Show Stats Download Patch File Download Diff File

2
configure vendored
Unescape View File

@ -2580,6 +2580,8 @@ fi
if [ "$CFG_THREAD" = "yes" ]; then if [ "$CFG_THREAD" = "yes" ]; then
QMAKE_OUTDIR="${QMAKE_OUTDIR}-mt" QMAKE_OUTDIR="${QMAKE_OUTDIR}-mt"
QMAKE_CONFIG="$QMAKE_CONFIG thread" QMAKE_CONFIG="$QMAKE_CONFIG thread"
else
QCONFIG_FLAGS="$QCONFIG_FLAGS TQT_NO_THREAD"
fi fi
if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then if [ "$PLATFORM_QWS" = "yes" -o "$PLATFORM_QNX" = "yes" ]; then
QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED" QMAKE_OUTDIR="${QMAKE_OUTDIR}-emb-$CFG_EMBEDDED"

2
qmake/Makefile.unix
Unescape View File

@ -36,7 +36,7 @@ CXXFLAGS= @QMAKE_CXXFLAGS@ \
-I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \ -I. -Igenerators -Igenerators/unix -Igenerators/win32 -Igenerators/mac \
-I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \ -I@BUILD_PATH@/include/qmake -I@BUILD_PATH@/include -I@SOURCE_PATH@/include \
-DTQT_NO_TEXTCODEC -DTQT_NO_UNICODETABLES -DTQT_NO_COMPONENT -DTQT_NO_STL \ -DTQT_NO_TEXTCODEC -DTQT_NO_UNICODETABLES -DTQT_NO_COMPONENT -DTQT_NO_STL \
-DTQT_NO_COMPRESS -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP -DTQT_NO_COMPRESS -DTQT_NO_THREAD -I@QMAKESPEC@ -DHAVE_QCONFIG_CPP
LFLAGS=@QMAKE_LFLAGS@ LFLAGS=@QMAKE_LFLAGS@
tqmake: $(OBJS) $(QOBJS) tqmake: $(OBJS) $(QOBJS)

2
qmake/Makefile.win32-g++
Unescape View File

@ -5,7 +5,7 @@ CXX = g++
CFLAGS = -c -o$@ -O \ CFLAGS = -c -o$@ -O \
-I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \ -I. -Igenerators -Igenerators\unix -Igenerators\win32 -Igenerators\mac -I..\include -I..\src\tools \
-I..\mkspecs\win32-g++ \ -I..\mkspecs\win32-g++ \
-DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS -DUNICODE -DTQT_NO_TEXTCODEC -DQT_LITE_COMPONENT -DQT_NODLL -DTQT_NO_STL -DTQT_NO_COMPRESS -DTQT_NO_THREAD
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
LFLAGS = LFLAGS =
LIBS = -lole32 -luuid LIBS = -lole32 -luuid

2
qmake/generators/unix/unixmake.cpp
Unescape View File

@ -228,8 +228,6 @@ UnixMakefileGenerator::init()
if ( project->isActiveConfig("dylib") ) if ( project->isActiveConfig("dylib") )
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_DYNLOAD"];
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) { if ( !project->isEmpty("QMAKE_CFLAGS_THREAD")) {
project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["PRL_EXPORT_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];

2
qmake/generators/win32/borland_bmake.cpp
Unescape View File

@ -426,8 +426,6 @@ BorlandMakefileGenerator::init()
project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"]; project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_WARN_ON"];
} }
if(project->isActiveConfig("qt")) { if(project->isActiveConfig("qt")) {
if ( project->isActiveConfig("thread") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( project->isActiveConfig("accessibility" ) ) if ( project->isActiveConfig("accessibility" ) )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") ) if ( project->isActiveConfig("tablet") )

9
qmake/generators/win32/mingw_make.cpp
Unescape View File

@ -428,11 +428,10 @@ MingwMakefileGenerator::init()
project->variables()["CONFIG"].append("dll"); project->variables()["CONFIG"].append("dll");
} }
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT"); project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"];
project->variables()["QMAKE_CFLAGS"] += project->variables()["QMAKE_CFLAGS_THREAD"]; project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"];
project->variables()["QMAKE_CXXFLAGS"] += project->variables()["QMAKE_CXXFLAGS_THREAD"]; project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"];
project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_THREAD"]; }
}
if ( project->isActiveConfig("accessibility" ) ) if ( project->isActiveConfig("accessibility" ) )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") ) if ( project->isActiveConfig("tablet") )

2
qmake/generators/win32/msvc_dsp.cpp
Unescape View File

@ -746,8 +746,6 @@ DspMakefileGenerator::init()
project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"]; project->variables()["QMAKE_LFLAGS"] += project->variables()["QMAKE_LFLAGS_OPENGL"];
} }
if ( thread ) { if ( thread ) {
if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain" if ( project->isActiveConfig("dll") || project->first("TARGET") == "qtmain"
|| !project->variables()["QMAKE_QT_DLL"].isEmpty() ) { || !project->variables()["QMAKE_QT_DLL"].isEmpty() ) {
project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"]; project->variables()["MSVCDSP_MTDEFD"] += project->variables()["QMAKE_CXXFLAGS_MT_DLLDBG"];

2
qmake/generators/win32/msvc_nmake.cpp
Unescape View File

@ -511,8 +511,6 @@ NmakeMakefileGenerator::init()
if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() ) if ( is_qt && !project->variables()["QMAKE_LIB_FLAG"].isEmpty() )
project->variables()["CONFIG"].append("dll"); project->variables()["CONFIG"].append("dll");
} }
if ( project->isActiveConfig("thread") )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT");
if ( project->isActiveConfig("accessibility" ) ) if ( project->isActiveConfig("accessibility" ) )
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT"); project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("QT_ACCESSIBILITY_SUPPORT");
if ( project->isActiveConfig("tablet") ) if ( project->isActiveConfig("tablet") )

3
qmake/generators/win32/msvc_vcproj.cpp
Unescape View File

@ -483,7 +483,6 @@ void VcprojGenerator::init()
} }
if( project->isActiveConfig("thread") ) { if( project->isActiveConfig("thread") ) {
project->variables()["DEFINES"] += "TQT_THREAD_SUPPORT";
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT_THREAD"];
} else { } else {
project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"]; project->variables()["QMAKE_LIBS"] += project->variables()["QMAKE_LIBS_QT"];
@ -1208,8 +1207,6 @@ void VcprojGenerator::initOld()
// THREAD -------------------------------------------------------- // THREAD --------------------------------------------------------
if ( project->isActiveConfig("thread") ) { if ( project->isActiveConfig("thread") ) {
if(project->isActiveConfig("qt"))
project->variables()[is_qt ? "PRL_EXPORT_DEFINES" : "DEFINES"].append("TQT_THREAD_SUPPORT" );
if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt if ( !project->variables()["DEFINES"].contains("QT_DLL") && is_qt
&& project->first("TARGET") != "qtmain" ) && project->first("TARGET") != "qtmain" )
project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc"); project->variables()["QMAKE_LFLAGS"].append("/NODEFAULTLIB:libc");

4
src/kernel/ntqthread.h
Unescape View File

@ -41,12 +41,12 @@
#ifndef TQTHREAD_H #ifndef TQTHREAD_H
#define TQTHREAD_H #define TQTHREAD_H
#if defined(TQT_THREAD_SUPPORT)
#ifndef QT_H #ifndef QT_H
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
#endif // QT_H #endif // QT_H
#if defined(TQT_THREAD_SUPPORT)
#include <limits.h> #include <limits.h>
class TQThreadInstance; class TQThreadInstance;

2
src/kernel/qthread.cpp
Unescape View File

@ -36,6 +36,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "qplatformdefs.h" #include "qplatformdefs.h"

2
src/kernel/qthread_unix.cpp
Unescape View File

@ -36,6 +36,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"

2
src/moc/moc.pro
Unescape View File

@ -3,7 +3,7 @@ TARGET = tqmoc
CONFIG = console release qtinc yacc lex_included yacc_no_name_mangle CONFIG = console release qtinc yacc lex_included yacc_no_name_mangle
DEFINES += QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT \ DEFINES += QT_MOC TQT_NO_CODECS QT_LITE_UNICODE TQT_NO_COMPONENT \
TQT_NO_STL TQT_NO_COMPRESS TQT_NO_STL TQT_NO_COMPRESS TQT_NO_THREAD
win32:DEFINES += QT_NODLL win32:DEFINES += QT_NODLL
DESTDIR = ../../bin DESTDIR = ../../bin

3
src/qt.pro
Unescape View File

@ -121,7 +121,8 @@ thread {
!win32-borland:TARGET = tqt-mt !win32-borland:TARGET = tqt-mt
win32-borland:TARGET = qtmt win32-borland:TARGET = qtmt
embedded:TARGET = qte-mt embedded:TARGET = qte-mt
DEFINES += TQT_THREAD_SUPPORT } else {
DEFINES += TQT_NO_THREAD
} }
!cups:DEFINES += TQT_NO_CUPS !cups:DEFINES += TQT_NO_CUPS

6
src/tools/ntqglobal.h
Unescape View File

@ -822,6 +822,12 @@ class TQString;
#include "ntqfeatures.h" #include "ntqfeatures.h"
#endif /* QT_H */ #endif /* QT_H */
// Keep the old flag for thread support in sync with the new one
#ifndef TQT_NO_THREAD
# define TQT_THREAD_SUPPORT
#else
# undef TQT_THREAD_SUPPORT
#endif
// //
// Create TQt DLL if QT_DLL is defined (Windows only) // Create TQt DLL if QT_DLL is defined (Windows only)

4
src/tools/ntqthreadstorage.h
Unescape View File

@ -39,12 +39,12 @@
#ifndef TQTHREADSTORAGE_H #ifndef TQTHREADSTORAGE_H
#define TQTHREADSTORAGE_H #define TQTHREADSTORAGE_H
#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqglobal.h" #include "ntqglobal.h"
#endif // QT_H #endif // QT_H
#ifdef TQT_THREAD_SUPPORT
class TQ_EXPORT TQThreadStorageData class TQ_EXPORT TQThreadStorageData
{ {
public: public:

2
src/tools/qcriticalsection_p.cpp
Unescape View File

@ -36,6 +36,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qt_windows.h" #include "qt_windows.h"

2
src/tools/qcriticalsection_p.h
Unescape View File

@ -54,6 +54,8 @@
// //
// //
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#if defined(TQ_WS_WIN) #if defined(TQ_WS_WIN)

2
src/tools/qmutex_unix.cpp
Unescape View File

@ -38,6 +38,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"

4
src/tools/qmutexpool_p.h
Unescape View File

@ -51,13 +51,13 @@
// //
// //
#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqmutex.h" #include "ntqmutex.h"
#include "ntqmemarray.h" #include "ntqmemarray.h"
#endif // QT_H #endif // QT_H
#ifdef TQT_THREAD_SUPPORT
class TQ_EXPORT TQMutexPool class TQ_EXPORT TQMutexPool
{ {
public: public:

2
src/tools/qsemaphore.cpp
Unescape View File

@ -38,6 +38,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "ntqsemaphore.h" #include "ntqsemaphore.h"

4
src/tools/qthreadinstance_p.h
Unescape View File

@ -51,13 +51,13 @@
// //
// //
#ifdef TQT_THREAD_SUPPORT
#ifndef QT_H #ifndef QT_H
#include "ntqmutex.h" #include "ntqmutex.h"
#include "ntqwindowdefs.h" #include "ntqwindowdefs.h"
#endif // QT_H #endif // QT_H
#ifdef TQT_THREAD_SUPPORT
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
#include <pthread.h> #include <pthread.h>
#endif #endif

2
src/tools/qthreadstorage_unix.cpp
Unescape View File

@ -36,6 +36,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#ifdef TQT_THREAD_SUPPORT #ifdef TQT_THREAD_SUPPORT
#include "qplatformdefs.h" #include "qplatformdefs.h"

2
src/tools/qwaitcondition_unix.cpp
Unescape View File

@ -38,6 +38,8 @@
** **
**********************************************************************/ **********************************************************************/
#include "ntqglobal.h"
#if defined(TQT_THREAD_SUPPORT) #if defined(TQT_THREAD_SUPPORT)
#include "qplatformdefs.h" #include "qplatformdefs.h"

Write Preview
Loading…
Cancel
Save