summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doc/tde_app_devel/index.docbook12
-rw-r--r--languages/cpp/app_templates/kscons_kxt/QUICKSTART2
-rw-r--r--languages/cpp/app_templates/kscons_kxt/SConscript-src2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/QUICKSTART2
-rw-r--r--languages/cpp/app_templates/kscons_tdemdi/SConscript-src2
-rw-r--r--parts/appwizard/common/scons/admin/kde.py2
6 files changed, 11 insertions, 11 deletions
diff --git a/doc/tde_app_devel/index.docbook b/doc/tde_app_devel/index.docbook
index dfcaec94..a325ec33 100644
--- a/doc/tde_app_devel/index.docbook
+++ b/doc/tde_app_devel/index.docbook
@@ -730,7 +730,7 @@ the compilation phase.
22 depfile='.deps/main.Po' tmpdepfile='.deps/main.TPo' \
23 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
24 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings
-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new
-c -o main.o `test -f 'main.cpp' || echo '/home/caleb/kscribble/src/'`main.cpp
@@ -739,7 +739,7 @@ the compilation phase.
27 depfile='.deps/kscribble.Po' tmpdepfile='.deps/kscribble.TPo' \
28 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
29 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings
-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new
-c -o kscribble.o `test -f 'kscribble.cpp' || echo '/home/caleb/kscribble/src/'`kscribble.cpp
@@ -750,7 +750,7 @@ the compilation phase.
34 depfile='.deps/kscribbleview.Po' tmpdepfile='.deps/kscribbleview.TPo' \
35 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
36 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -ansi
-D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new -c
-o kscribbleview.o `test -f 'kscribbleview.cpp' || echo '/home/caleb/kscribble/src/'`kscribbleview.cpp
@@ -764,7 +764,7 @@ the compilation phase.
44 depfile='.deps/pref.Po' tmpdepfile='.deps/pref.TPo' \
45 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
46 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings
-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new
-c -o pref.o `test -f 'pref.cpp' || echo '/home/caleb/kscribble/src/'`pref.cpp
@@ -775,7 +775,7 @@ the compilation phase.
50 depfile='.deps/kscribbleiface_skel.Po' tmpdepfile='.deps/kscribbleiface_skel.TPo' \
51 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
52 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings
-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new
-c -o kscribbleiface_skel.o `test -f 'kscribbleiface_skel.cpp' ||
@@ -789,7 +789,7 @@ the compilation phase.
55 depfile='.deps/kscribble_client.Po' tmpdepfile='.deps/kscribble_client.TPo' \
56 depmode=gcc3 /bin/sh /home/caleb/kscribble/admin/depcomp \
57 g++ -DHAVE_CONFIG_H -I. -I/home/caleb/kscribble/src -I.. -I/usr/local/trinity/include
- -I/usr/lib/qt/include -I/usr/X11R6/include -DQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
+ -I/usr/lib/qt/include -I/usr/X11R6/include -DTQT_THREAD_SUPPORT -D_REENTRANT -Wnon-virtual-dtor
-Wno-long-long -Wundef -Wall -pedantic -W -Wpointer-arith -Wmissing-prototypes -Wwrite-strings
-ansi -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -Wcast-align -Wconversion -O2 -fno-exceptions -fno-check-new
-c -o kscribble_client.o `test -f 'kscribble_client.cpp' || echo
diff --git a/languages/cpp/app_templates/kscons_kxt/QUICKSTART b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
index a5fbba33..0028fa2c 100644
--- a/languages/cpp/app_templates/kscons_kxt/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_kxt/QUICKSTART
@@ -137,7 +137,7 @@ especially if you are doing experiments (it saves your computer
from recompiling the same files over and over again ..).
** threading **
-myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )
+myenv.AppendUnique( CPPFLAGS = ['-DTQT_THREAD_SUPPORT', '-D_REENTRANT'] )
** final notes ***
A medium-sized project containing several targets, libraries and data
diff --git a/languages/cpp/app_templates/kscons_kxt/SConscript-src b/languages/cpp/app_templates/kscons_kxt/SConscript-src
index 173b458f..57180fa5 100644
--- a/languages/cpp/app_templates/kscons_kxt/SConscript-src
+++ b/languages/cpp/app_templates/kscons_kxt/SConscript-src
@@ -43,7 +43,7 @@ myenv.TDEaddlibs( "tqt-mt tqtinterface tdeio tdecore tdeprint" )
# myenv.TDEaddflags_link('-export-dynamic')
## If you are using QThread, add this line
-# myenv.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
+# myenv.TDEaddflags_link( '-DTQT_THREAD_SUPPORT' )
#############################
## Installation
diff --git a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
index a5fbba33..0028fa2c 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
+++ b/languages/cpp/app_templates/kscons_tdemdi/QUICKSTART
@@ -137,7 +137,7 @@ especially if you are doing experiments (it saves your computer
from recompiling the same files over and over again ..).
** threading **
-myenv.AppendUnique( CPPFLAGS = ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )
+myenv.AppendUnique( CPPFLAGS = ['-DTQT_THREAD_SUPPORT', '-D_REENTRANT'] )
** final notes ***
A medium-sized project containing several targets, libraries and data
diff --git a/languages/cpp/app_templates/kscons_tdemdi/SConscript-src b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
index 26fa3265..90ee0059 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
+++ b/languages/cpp/app_templates/kscons_tdemdi/SConscript-src
@@ -32,7 +32,7 @@ myenv2=env.Copy()
myenv2.TDEshlib( 'lib%{APPNAMELC}part', %{APPNAMELC}part_sources)
myenv2.TDEaddpaths_includes( './ #/' ) # the '#' means the top-level directory
myenv2.TDEaddlibs( 'tqt-mt tqtinterface tdeio tdecore tdeprint tdeparts' )
-# myenv2.TDEaddflags_link( '-DQT_THREAD_SUPPORT' )
+# myenv2.TDEaddflags_link( '-DTQT_THREAD_SUPPORT' )
#############################
## Data files to install
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index d194fd84..e9f94d57 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -826,7 +826,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
lenv.Append( RPATH = [env['QTLIBPATH'], env['KDELIBPATH'], env['KDEMODULE']] )
if 'thread' in _flags:
## Uncomment the following if you need threading support
- lenv.KDEaddflags_cxx( ['-DQT_THREAD_SUPPORT', '-D_REENTRANT'] )
+ lenv.KDEaddflags_cxx( ['-DTQT_THREAD_SUPPORT', '-D_REENTRANT'] )
if not 'nohelp' in _flags:
if lenv['_CONFIGURE'] or lenv['HELP']:
env.Exit(0)
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-10 11:31:13 +0000