Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/1/head
Michele Calgaro 6 years ago
parent a6fa759af6
commit 2cd0c8be29
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF

@ -4,7 +4,7 @@ AM_CXXFLAGS = -frtti
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes) INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. $(all_includes)
INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST INCLUDES += -DQT_NO_ASCII_CAST
SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs SUBDIRS = bindings builtins qtbindings . plugin plugins tdescript stdlib cpptests docs

@ -1,6 +1,6 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -Wno-unused KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedbindings.la noinst_LTLIBRARIES = libkjsembedbindings.la

@ -1,5 +1,5 @@
INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes) INCLUDES= -I$(srcdir)/../.. -I.. -I$(top_srcdir)/kjsembed $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -Wno-unused KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedbuiltins.la noinst_LTLIBRARIES = libkjsembedbuiltins.la

@ -3,7 +3,7 @@
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes) INCLUDES = -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/../../../.. -I.. -I$(top_srcdir) $(all_includes)
INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST INCLUDES += -DQT_NO_ASCII_CAST
noinst_PROGRAMS = jsaccess noinst_PROGRAMS = jsaccess

@ -4013,7 +4013,7 @@
- Moved loadScript(filename) from main.cpp into the KPart, and renamed - Moved loadScript(filename) from main.cpp into the KPart, and renamed
the existing loadXX() to executeXX() which is better anyway. the existing loadXX() to executeXX() which is better anyway.
- Added -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST to the build flags. - Added -DQT_NO_ASCII_CAST to the build flags.
- Added a standalone factory class. This class is responsible for - Added a standalone factory class. This class is responsible for
creating the various objects, and for creating bindings. creating the various objects, and for creating bindings.

@ -3,7 +3,7 @@
# Make sure the include path includes Qt's uilib # Make sure the include path includes Qt's uilib
INCLUDES= -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes) INCLUDES= -I$(QTDIR)/tools/designer/uilib -I$(srcdir)/.. -I.. -I$(top_srcdir) $(all_includes)
INCLUDES += -DQT_CLEAN_NAMESPACE -DQT_NO_ASCII_CAST INCLUDES += -DQT_NO_ASCII_CAST
kde_module_LTLIBRARIES = libjsconsoleplugin.la kde_module_LTLIBRARIES = libjsconsoleplugin.la

@ -1,5 +1,5 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE KDE_CXXFLAGS = -DQT_NO_ASCII_CAST
kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la kde_module_LTLIBRARIES = libimagefxplugin.la libqprocessplugin.la libfileitemplugin.la
noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la

@ -1,6 +1,6 @@
INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes) INCLUDES= -I$(srcdir)/.. -I$(srcdir)/../.. $(all_includes)
KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -DQT_CLEAN_NAMESPACE -Wno-unused KDE_CXXFLAGS = -DQT_NO_ASCII_CAST -Wno-unused
noinst_LTLIBRARIES = libkjsembedqtbindings.la noinst_LTLIBRARIES = libkjsembedqtbindings.la

Loading…
Cancel
Save