diff options
| -rw-r--r-- | kjsembed/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/bindings/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/builtins/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/cpptests/jsaccess/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/docs/ChangeLog | 2 | ||||
| -rw-r--r-- | kjsembed/plugin/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/plugins/Makefile.am | 2 | ||||
| -rw-r--r-- | kjsembed/qtbindings/Makefile.am | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/kjsembed/Makefile.am b/kjsembed/Makefile.am index 3f9b9878..a2743ae8 100644 --- a/kjsembed/Makefile.am +++ b/kjsembed/Makefile.am @@ -4,7 +4,7 @@ AM_CXXFLAGS = -frtti # Make sure the include path includes Qt's uilib 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 diff --git a/kjsembed/bindings/Makefile.am b/kjsembed/bindings/Makefile.am index 2c6a187e..3d7ee10d 100644 --- a/kjsembed/bindings/Makefile.am +++ b/kjsembed/bindings/Makefile.am @@ -1,6 +1,6 @@ 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 diff --git a/kjsembed/builtins/Makefile.am b/kjsembed/builtins/Makefile.am index 0a0ef2db..61e17518 100644 --- a/kjsembed/builtins/Makefile.am +++ b/kjsembed/builtins/Makefile.am @@ -1,5 +1,5 @@ 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 diff --git a/kjsembed/cpptests/jsaccess/Makefile.am b/kjsembed/cpptests/jsaccess/Makefile.am index 69feea06..3dee5ff9 100644 --- a/kjsembed/cpptests/jsaccess/Makefile.am +++ b/kjsembed/cpptests/jsaccess/Makefile.am @@ -3,7 +3,7 @@ # Make sure the include path includes Qt's uilib 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 diff --git a/kjsembed/docs/ChangeLog b/kjsembed/docs/ChangeLog index acf9f517..201a3203 100644 --- a/kjsembed/docs/ChangeLog +++ b/kjsembed/docs/ChangeLog @@ -4013,7 +4013,7 @@ - Moved loadScript(filename) from main.cpp into the KPart, and renamed 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 creating the various objects, and for creating bindings. diff --git a/kjsembed/plugin/Makefile.am b/kjsembed/plugin/Makefile.am index 4d442105..2a75ff87 100644 --- a/kjsembed/plugin/Makefile.am +++ b/kjsembed/plugin/Makefile.am @@ -3,7 +3,7 @@ # Make sure the include path includes Qt's uilib 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 diff --git a/kjsembed/plugins/Makefile.am b/kjsembed/plugins/Makefile.am index 7cfbe5ff..e4521c66 100644 --- a/kjsembed/plugins/Makefile.am +++ b/kjsembed/plugins/Makefile.am @@ -1,5 +1,5 @@ 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 noinst_LTLIBRARIES = libcustomobjectplugin.la libcustomqobjectplugin.la diff --git a/kjsembed/qtbindings/Makefile.am b/kjsembed/qtbindings/Makefile.am index 98d004e3..b4bf0aa6 100644 --- a/kjsembed/qtbindings/Makefile.am +++ b/kjsembed/qtbindings/Makefile.am @@ -1,6 +1,6 @@ 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 |