Commit 1b4e6f1a authored by Kevin Funk's avatar Kevin Funk
Browse files

Renable qmakebuilder

Lost add_subdirectoy call during merge
parent 3191b895
add_subdirectory(makebuilder) add_subdirectory(makebuilder)
add_subdirectory(ninjabuilder) add_subdirectory(ninjabuilder)
ecm_optional_add_subdirectory(cmakebuilder) ecm_optional_add_subdirectory(cmakebuilder)
ecm_optional_add_subdirectory(qmakebuilder)
...@@ -14,6 +14,7 @@ target_link_libraries(kdevqmakebuilder ...@@ -14,6 +14,7 @@ target_link_libraries(kdevqmakebuilder
KDev::OutputView KDev::OutputView
KDev::Util KDev::Util
KDev::Project KDev::Project
kdevqmakecommon
) )
install( FILES iqmakebuilder.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevelop/qmake COMPONENT Devel) install( FILES iqmakebuilder.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/kdevelop/qmake COMPONENT Devel)
......
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include "qmakebuilder.h" #include "qmakebuilder.h"
#include "qmakebuilderpreferences.h" #include "qmakebuilderpreferences.h"
#include "../qmakeconfig.h" #include "qmakeconfig.h"
#include <QtCore/QStringList> #include <QtCore/QStringList>
#include <QDebug> #include <QDebug>
......
...@@ -33,9 +33,9 @@ ...@@ -33,9 +33,9 @@
#include <KJobWidgets> #include <KJobWidgets>
#include "ui_qmakeconfig.h" #include "ui_qmakeconfig.h"
#include "../qmakebuilddirchooser.h" #include "qmakebuilddirchooser.h"
#include "../qmakebuilddirchooserdialog.h" #include "qmakebuilddirchooserdialog.h"
#include "../qmakeconfig.h" #include "qmakeconfig.h"
#include "qmakebuilderconfig.h" #include "qmakebuilderconfig.h"
#include "qmakebuilderdebug.h" #include "qmakebuilderdebug.h"
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
#include "qmakejob.h" #include "qmakejob.h"
#include "../qmakeconfig.h" #include "qmakeconfig.h"
#include <interfaces/iproject.h> #include <interfaces/iproject.h>
#include <outputview/ioutputview.h> #include <outputview/ioutputview.h>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment