From 62482ed8290b0a77a0ca2192e65cc62c1877e8e8 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 17 Nov 2012 00:24:19 -0600 Subject: [PATCH] Fix FTBFS (cherry picked from commit b58594732f9c6342b36ce7bc1bf9a1a4c3dd810c) --- kdevdesigner/designer/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kdevdesigner/designer/Makefile.am b/kdevdesigner/designer/Makefile.am index e0aacb85..d9b0a33c 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 -ltqassistantclient $(LIB_KFILE) $(LIB_KPARTS) + $(top_builddir)/lib/interfaces/external/libkinterfacedesigner.la $(LIB_QT) $(LIB_KDECORE) $(LIB_KDEUI) -lqassistantclient $(LIB_KFILE) $(LIB_KPARTS) 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)