diff options
| author | Michele Calgaro <[email protected]> | 2018-09-25 01:20:51 +0900 |
|---|---|---|
| committer | Michele Calgaro <[email protected]> | 2018-09-25 01:20:51 +0900 |
| commit | d2b4f2a5d45bf5906930a282adb9b4f4b86e05c4 (patch) | |
| tree | 6c318ad0057cdd2cc0c786ea9c60e0b7afbfe990 | |
| parent | 69ee1128adc7f971b272b714441748f5fec8a1b0 (diff) | |
| download | gwenview-d2b4f2a5d45bf5906930a282adb9b4f4b86e05c4.tar.gz gwenview-d2b4f2a5d45bf5906930a282adb9b4f4b86e05c4.zip | |
Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.
Signed-off-by: Michele Calgaro <[email protected]>
| -rw-r--r-- | configure.in.in | 2 | ||||
| -rw-r--r-- | src/gvcore/mngformattype.cpp | 4 | ||||
| -rw-r--r-- | src/imageutils/Makefile.am | 5 |
3 files changed, 2 insertions, 9 deletions
diff --git a/configure.in.in b/configure.in.in index 1cdda0b..fc75ba2 100644 --- a/configure.in.in +++ b/configure.in.in @@ -99,7 +99,7 @@ AC_SUBST(GV_ASM_DEFS) # LIBMNG= CXXFLAGS_SAVE="$CXXFLAGS" -CXXFLAGS="$CXXFLAGS -DQT_CLEAN_NAMESPACE" +CXXFLAGS="$CXXFLAGS" KDE_CHECK_HEADER(libmng.h, [ KDE_CHECK_LIB(mng, mng_initialize, diff --git a/src/gvcore/mngformattype.cpp b/src/gvcore/mngformattype.cpp index f613f05..fa1e445 100644 --- a/src/gvcore/mngformattype.cpp +++ b/src/gvcore/mngformattype.cpp @@ -75,10 +75,6 @@ #include <config.h> -#ifndef TQT_CLEAN_NAMESPACE -#define TQT_CLEAN_NAMESPACE -#endif - #include "tqdatetime.h" #include "mngformattype.h" diff --git a/src/imageutils/Makefile.am b/src/imageutils/Makefile.am index 6f2e08f..100d4b0 100644 --- a/src/imageutils/Makefile.am +++ b/src/imageutils/Makefile.am @@ -1,7 +1,4 @@ -# QT_CLEAN_NAMESPACE is needed when building with automake, otherwise -# compilation fails in jpegcontent.cpp -AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(LIBEXIF_CFLAGS) $(all_includes) \ - -DQT_CLEAN_NAMESPACE +AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(LIBEXIF_CFLAGS) $(all_includes) AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS) KDE_CXXFLAGS = $(USE_EXCEPTIONS) |