Commit 4b125189 authored by Roberto Raggi's avatar Roberto Raggi
Browse files

Cleanup

parent 3612a50d
......@@ -8,20 +8,16 @@ include(../../plugins/texteditor/texteditor.pri)
include(../../shared/qscripthighlighter/qscripthighlighter.pri)
include(../../shared/indenter/indenter.pri)
QT_BUILD_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_BUILD_TREE)
QT_SOURCE_TREE=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
DUI=$$(QTDIR_DUI)
isEmpty(DUI):DUI=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
exists($$QT_SOURCE_TREE/src/declarative/qml/parser) {
include($$QT_SOURCE_TREE/src/declarative/qml/parser/parser.pri)
INCLUDEPATH += $$QT_SOURCE_TREE/src/declarative/qml
!isEmpty(DUI):exists($$DUI/src/declarative/qml/parser) {
include($$DUI/src/declarative/qml/parser/parser.pri)
INCLUDEPATH += $$DUI/src/declarative/qml
} else {
DUI=$$(QTDIR_DUI)
isEmpty(DUI):error(run with export QTDIR_DUI=<path to kinetic/qt>)
include($$(QTDIR_DUI)/src/declarative/qml/parser/parser.pri)
INCLUDEPATH += $$(QTDIR_DUI)/src/declarative/qml
error(run with export QTDIR_DUI=<path to kinetic/qt>)
}
include(rewriter/rewriter.pri)
HEADERS += duieditor.h \
......
......@@ -24,16 +24,31 @@ SUBDIRS = plugin_coreplugin \
plugin_help \
# plugin_regexp \ # don't know what to do with this
plugin_qtscripteditor \
plugin_duieditor \
plugin_cpaster \
plugin_cmakeprojectmanager \
plugin_fakevim \
plugin_designer \
plugin_resourceeditor \
plugin_genericprojectmanager \
plugin_qmlprojectmanager \
debugger/dumper.pro
DUI=$$(QTDIR_DUI)
isEmpty(DUI):DUI=$$fromfile($$(QTDIR)/.qmake.cache,QT_SOURCE_TREE)
!isEmpty(DUI):exists($$DUI/src/declarative/qml/parser) {
SUBDIRS += plugin_duieditor \
plugin_qmlprojectmanager
plugin_duieditor.subdir = duieditor
plugin_duieditor.depends = plugin_texteditor
plugin_duieditor.depends += plugin_coreplugin
plugin_qmlprojectmanager.subdir = qmlprojectmanager
plugin_qmlprojectmanager.depends = plugin_texteditor
plugin_qmlprojectmanager.depends += plugin_projectexplorer
plugin_qmlprojectmanager.depends += plugin_help
}
plugin_coreplugin.subdir = coreplugin
plugin_find.subdir = find
......@@ -141,10 +156,6 @@ plugin_qtscripteditor.subdir = qtscripteditor
plugin_qtscripteditor.depends = plugin_texteditor
plugin_qtscripteditor.depends += plugin_coreplugin
plugin_duieditor.subdir = duieditor
plugin_duieditor.depends = plugin_texteditor
plugin_duieditor.depends += plugin_coreplugin
plugin_cpaster.subdir = cpaster
plugin_cpaster.depends += plugin_texteditor
plugin_cpaster.depends += plugin_coreplugin
......@@ -163,8 +174,3 @@ plugin_genericprojectmanager.depends += plugin_projectexplorer
plugin_genericprojectmanager.depends += plugin_cpptools
plugin_genericprojectmanager.depends += plugin_cppeditor
plugin_genericprojectmanager.depends += plugin_help
plugin_qmlprojectmanager.subdir = qmlprojectmanager
plugin_qmlprojectmanager.depends = plugin_texteditor
plugin_qmlprojectmanager.depends += plugin_projectexplorer
plugin_qmlprojectmanager.depends += plugin_help
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