diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:13:49 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-09-18 01:13:49 +0900 |
| commit | 2c46c17371461099374ebef5182933b1975631fb (patch) | |
| tree | bf281859bd7bb5e6892236b4b13ffcf500433426 | |
| parent | 9b5a0aee312739e144d806a401e348470c5dcec1 (diff) | |
| download | kdiff3-2c46c173.tar.gz kdiff3-2c46c173.zip | |
QT_THREAD_SUPPORT -> TQT_THREAD_SUPPORT conversion to align to updated admin module
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | acinclude.m4 | 2 | ||||
| -rw-r--r-- | kdiff3plugin/po/Makefile | 2 | ||||
| -rw-r--r-- | src/Makefile.qt | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/acinclude.m4 b/acinclude.m4 index 97d87b2..268444a 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -1333,7 +1333,7 @@ KDE_MT_LIBS= if test "x$kde_use_qt_mt" = "xyes"; then KDE_CHECK_THREADING if test "x$kde_use_threading" = "xyes"; then - CPPFLAGS="$USE_THREADS -DQT_THREAD_SUPPORT $CPPFLAGS" + CPPFLAGS="$USE_THREADS -DTQT_THREAD_SUPPORT $CPPFLAGS" KDE_MT_LDFLAGS="$USE_THREADS" KDE_MT_LIBS="$LIBPTHREAD" else diff --git a/kdiff3plugin/po/Makefile b/kdiff3plugin/po/Makefile index 15522a2..d1f45ac 100644 --- a/kdiff3plugin/po/Makefile +++ b/kdiff3plugin/po/Makefile @@ -70,7 +70,7 @@ CCDEPMODE = depmode=gcc3 CFLAGS = -std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -O2 -Wall -g -O2 -Wformat-security -Wmissing-format-attribute CONF_FILES = $(top_srcdir)/./admin/configure.in.min $(top_srcdir)/configure.in.in CPP = i486-linux-gnu-gcc -E -CPPFLAGS = -DQT_THREAD_SUPPORT -D_REENTRANT +CPPFLAGS = -DTQT_THREAD_SUPPORT -D_REENTRANT CXX = i486-linux-gnu-g++ CXXCPP = i486-linux-gnu-g++ -E CXXDEPMODE = depmode=gcc3 diff --git a/src/Makefile.qt b/src/Makefile.qt index bc29fd3..5747420 100644 --- a/src/Makefile.qt +++ b/src/Makefile.qt @@ -12,8 +12,8 @@ CC = gcc CXX = g++ LEX = flex YACC = yacc -CFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM -CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM +CFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM +CXXFLAGS = -pipe -O2 -Wall -W -fPIC -D_REENTRANT -DQT_NO_DEBUG -DTQT_THREAD_SUPPORT -DQT_SHARED -DQT_TABLET_SUPPORT -D__USE_STD_IOSTREAM LEXFLAGS = YACCFLAGS= -d INCPATH = -I$(QTDIR)/mkspecs/default -I. -Ikreplacements -I/usr/include -I$(QTDIR)/include |