summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2013-12-11 06:04:47 +0100
committerSlávek Banko <slavek.banko@axis.cz>2013-12-11 06:05:27 +0100
commit64006cfc2114e668d0a9f461eb6679c0cf9073e3 (patch)
tree983b90cc9fbdfd470310648ee8f1198cb4d97599
parenta71807f887e8059f39938f36f1713f46f68a4b35 (diff)
downloadtdevelop-64006cfc2114e668d0a9f461eb6679c0cf9073e3.tar.gz
tdevelop-64006cfc2114e668d0a9f461eb6679c0cf9073e3.zip
Fix FTBFS due to qassistantclient rename
This resolves Bug 1761
-rw-r--r--kdevdesigner/designer/CMakeLists.txt2
-rw-r--r--kdevdesigner/designer/Makefile.am2
2 files changed, 2 insertions, 2 deletions
diff --git a/kdevdesigner/designer/CMakeLists.txt b/kdevdesigner/designer/CMakeLists.txt
index c0370f26..4cdcea2b 100644
--- a/kdevdesigner/designer/CMakeLists.txt
+++ b/kdevdesigner/designer/CMakeLists.txt
@@ -102,6 +102,6 @@ tde_add_kpart( libkdevdesignerpart AUTOMOC
SOURCES ${SRCS}
LINK
kdevqui-static shared-static kinterfacedesigner-shared
- tdeio-shared tdeparts-shared qassistantclient
+ tdeio-shared tdeparts-shared tqassistantclient
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am
index d8dac401..1857de19 100644
--- a/kdevdesigner/designer/Makefile.am
+++ b/kdevdesigner/designer/Makefile.am
@@ -9,7 +9,7 @@ kde_module_LTLIBRARIES = libkdevdesignerpart.la
libkdevdesignerpart_la_LDFLAGS = $(KDE_PLUGIN) $(all_libraries)
libkdevdesignerpart_la_LIBADD = \
$(top_builddir)/kdevdesigner/uilib/libkdevqui.la $(top_builddir)/kdevdesigner/shared/libshared.la \
- $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -lqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS)
+ $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_TDECORE) $(LIB_TDEUI) -ltqassistantclient $(LIB_TDEFILE) $(LIB_TDEPARTS)
libkdevdesignerpart_la_SOURCES = kdevdesigner_part.cpp actiondnd.cpp actioneditorimpl.cpp actionlistview.cpp asciivalidator.cpp command.cpp connectionitems.cpp connectiontable.cpp customwidgeteditorimpl.cpp database.cpp dbconnectionimpl.cpp dbconnectionsimpl.cpp defs.cpp designerapp.cpp designerappiface.cpp editfunctionsimpl.cpp filechooser.cpp formfile.cpp formsettingsimpl.cpp formwindow.cpp hierarchyview.cpp iconvieweditorimpl.cpp layout.cpp listboxdnd.cpp listboxeditorimpl.cpp listboxrename.cpp listdnd.cpp listviewdnd.cpp listvieweditorimpl.cpp mainwindow.cpp mainwindowactions.cpp menubareditor.cpp metadatabase.cpp multilineeditorimpl.cpp newformimpl.cpp orderindicator.cpp outputwindow.cpp paletteeditoradvancedimpl.cpp paletteeditorimpl.cpp pixmapchooser.cpp pixmapcollection.cpp popupmenueditor.cpp previewframe.cpp previewwidgetimpl.cpp project.cpp projectsettingsimpl.cpp propertyeditor.cpp propertyobject.cpp qcompletionedit.cpp resource.cpp sizehandle.cpp sourceeditor.cpp sourcefile.cpp startdialogimpl.cpp styledbutton.cpp syntaxhighlighter_html.cpp tableeditorimpl.cpp timestamp.cpp variabledialogimpl.cpp widgetaction.cpp widgetfactory.cpp wizardeditorimpl.cpp workspace.cpp about.ui dbconnection.ui gotolinedialog.ui newform.ui previewwidget.ui variabledialog.ui actioneditor.ui dbconnectioneditor.ui iconvieweditor.ui paletteeditor.ui projectsettings.ui wizardeditor.ui configtoolboxdialog.ui dbconnections.ui listboxeditor.ui paletteeditoradvanced.ui replacedialog.ui connectiondialog.ui editfunctions.ui listeditor.ui pixmapcollectioneditor.ui richtextfontdialog.ui createtemplate.ui finddialog.ui listvieweditor.ui pixmapfunction.ui startdialog.ui customwidgeteditor.ui formsettings.ui multilineeditor.ui preferences.ui tableeditor.ui designeraction.cpp myiconloader.cpp
partrcdir = $(kde_datadir)/kdevdesignerpart
partdesktopdir = $(kde_servicesdir)