From 87903775ed0374ef80986582b14bc8ffd0678b52 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 27 Sep 2018 16:03:54 +0900 Subject: [PATCH] qt -> tqt conversion: QTDIR -> TQTDIR QTDOC -> TQTDOC INCDIR_QT -> INCDIR_TQT LIBDIR_QT -> LIBDIR_TQT QT_INC -> TQT_INC QT_LIB -> TQT_LIB Signed-off-by: Michele Calgaro --- .../dependencies/poppler-tqt/ConfigureChecks.cmake | 2 +- tdefile-plugins/dependencies/poppler-tqt/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake index 2d2e5136..79016798 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake +++ b/tdefile-plugins/dependencies/poppler-tqt/ConfigureChecks.cmake @@ -7,7 +7,7 @@ else( ) endif( ) tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) -set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${QT_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS}) +set( CMAKE_REQUIRED_INCLUDES ${DBUS_TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${TQT_INCLUDE_DIRS} ${POPPLER_INCLUDE_DIRS}) set( CMAKE_REQUIRED_LIBRARIES ${DBUS_TQT_LDFLAGS} ${TQT_LDFLAGS} ${QT_LDFLAGS} ${POPPLER_LDFLAGS} ) check_cxx_source_compiles(" #include diff --git a/tdefile-plugins/dependencies/poppler-tqt/Makefile.am b/tdefile-plugins/dependencies/poppler-tqt/Makefile.am index acc259c5..7de8524c 100644 --- a/tdefile-plugins/dependencies/poppler-tqt/Makefile.am +++ b/tdefile-plugins/dependencies/poppler-tqt/Makefile.am @@ -26,7 +26,7 @@ libpoppler_tqt_la_SOURCES = \ libpoppler_tqt_la_LIBADD = \ -lpoppler \ - $(QT_LIBS) \ + $(TQT_LIBS) \ $(FREETYPE_LIBS) \ $(FONTCONFIG_LIBS) @@ -36,5 +36,5 @@ test_poppler_tqt_SOURCES = \ test_poppler_tqt_LDADD = \ $(top_builddir)/poppler/libpoppler.la \ libpoppler-tqt.la \ - $(QT_LIBS) \ + $(TQT_LIBS) \ $(FREETYPE_LIBS)