summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-01 21:32:26 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-01-01 21:32:26 +0000
commit7de042bb5beca4107a444f8c60ef24c9735deb65 (patch)
treef56e884bc13c78323341fcb504d823e7dc371a2f
parentbf3bdf1468c5264a57b6aac343f8c7d1a50de848 (diff)
downloadarts-7de042bb5beca4107a444f8c60ef24c9735deb65.tar.gz
arts-7de042bb5beca4107a444f8c60ef24c9735deb65.zip
Fix FTBFS under TQt for Qt3
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1210721 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
-rw-r--r--qtmcop/CMakeLists.txt6
-rw-r--r--qtmcop/Makefile.am2
-rw-r--r--qtmcop/qiomanager.cc2
3 files changed, 5 insertions, 5 deletions
diff --git a/qtmcop/CMakeLists.txt b/qtmcop/CMakeLists.txt
index 75764c5..48d625c 100644
--- a/qtmcop/CMakeLists.txt
+++ b/qtmcop/CMakeLists.txt
@@ -35,13 +35,13 @@ install( FILES
##### qtmcop ##############################
add_custom_command(
- OUTPUT qiomanager_p.tqmoc
- COMMAND tqmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.tqmoc
+ OUTPUT qiomanager_p.moc
+ COMMAND tqmoc ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h -o qiomanager_p.moc
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/qiomanager_p.h
)
tde_add_library( qtmcop SHARED
- SOURCES qiomanager.cc qiomanager_p.tqmoc
+ SOURCES qiomanager.cc qiomanager_p.moc
VERSION 1.0.0
LINK mcop-shared ${TQT_LIBRARIES}
DESTINATION ${LIB_INSTALL_DIR}
diff --git a/qtmcop/Makefile.am b/qtmcop/Makefile.am
index 11a7c18..74f638a 100644
--- a/qtmcop/Makefile.am
+++ b/qtmcop/Makefile.am
@@ -8,7 +8,7 @@ libqtmcop_la_LIBADD = $(top_builddir)/mcop/libmcop.la $(LIB_QT)
libqtmcop_la_LDFLAGS = -no-undefined -version-info 1:0 $(KDE_RPATH) \
$(KDE_MT_LDFLAGS) $(QT_LDFLAGS) $(USER_LDFLAGS) $(X_LDFLAGS) $(LDFLAGS_AS_NEEDED)
-METASOURCES = qiomanager_p.tqmoc
+METASOURCES = qiomanager_p.moc
artsincludedir = $(includedir)/arts
artsinclude_HEADERS = qiomanager.h
diff --git a/qtmcop/qiomanager.cc b/qtmcop/qiomanager.cc
index 041e7e6..ee60977 100644
--- a/qtmcop/qiomanager.cc
+++ b/qtmcop/qiomanager.cc
@@ -296,4 +296,4 @@ void QIOManager::setBlocking(bool blocking)
qioBlocking = blocking;
}
-#include "qiomanager_p.tqmoc"
+#include "qiomanager_p.moc"