summaryrefslogtreecommitdiffstats
path: root/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
diff options
context:
space:
mode:
authorMichele Calgaro <[email protected]>2018-09-25 01:21:23 +0900
committerMichele Calgaro <[email protected]>2018-09-25 01:21:23 +0900
commitd7c8276a83dd8a141c2337291b449b0f028075a5 (patch)
tree32d7da08d7f8e2dc391659420a370a21518e066f /libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
parent36ab8c1905ec4aa4eb6b13acb2444035145dbf27 (diff)
downloadthirdparty-d7c8276a83dd8a141c2337291b449b0f028075a5.tar.gz
thirdparty-d7c8276a83dd8a141c2337291b449b0f028075a5.zip
Remove QT_CLEAN_NAMESPACE/TQT_CLEAN_NAMESPACE unnecessary define.
Signed-off-by: Michele Calgaro <[email protected]>
Diffstat (limited to 'libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff')
-rw-r--r--libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff4
1 files changed, 2 insertions, 2 deletions
diff --git a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
index 473edb2..b53cbc8 100644
--- a/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
+++ b/libreoffice/git_10_28_2011/patches/libreoffice-trinity.diff
@@ -238,7 +238,7 @@ index 3b48331..2888cbb 100644
+ fi
+
+ dnl Set the variables
-+ TDE_CFLAGS="-I$qt_incdir -I$tde_incdir -I/usr/include/tqt -DQT_CLEAN_NAMESPACE -DTQT_THREAD_SUPPORT"
++ TDE_CFLAGS="-I$qt_incdir -I$tde_incdir -I/usr/include/tqt -DTQT_THREAD_SUPPORT"
+ TDE_LIBS="-L$tde_libdir -L$qt_libdir -lkdeui -lkdecore -ltqt -lqt-mt"
+fi
+AC_SUBST(TDE_CFLAGS)
@@ -13120,7 +13120,7 @@ index 74ed8d5..d6ce918 100644
+# enable building/linking TDE-dependent code in both OOo and SO build environment
+.IF "$(ENABLE_TDE)" != ""
+.IF "$(TDE_ROOT)"!=""
-+TDE_CFLAGS:=-I$(TDE_ROOT)/include -I/usr/include/tqt -DQT_CLEAN_NAMESPACE
++TDE_CFLAGS:=-I$(TDE_ROOT)/include -I/usr/include/tqt
+TDE_LIBS:=-lkdeui -lkdecore -ltqt -lqt-mt
+SOLARLIB+=-L$(TDE_ROOT)/lib
+.ENDIF # "$(TDE_ROOT)"!=""