Skip to content
Snippets Groups Projects
Commit fe0533de authored by hjk's avatar hjk
Browse files

Fixes: move all files in shared/* to src/shared/*

parent c85ba533
No related branches found
No related tags found
No related merge requests found
Showing
with 15 additions and 16 deletions
IDE_BUILD_TREE = $$OUT_PWD/../../
include(../qworkbench.pri)
include(../../shared/qtsingleapplication/qtsingleapplication.pri)
include(../shared/qtsingleapplication/qtsingleapplication.pri)
macx {
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
......
INCLUDEPATH += $$PWD/../../../shared/cplusplus
INCLUDEPATH += $$PWD/../../shared/cplusplus
DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
LIBS *= -l$$qtLibraryTarget(CPlusPlus)
......@@ -7,7 +7,7 @@ DEFINES += NDEBUG
unix:QMAKE_CXXFLAGS_DEBUG += -O3
include(../../qworkbenchlibrary.pri)
include(../../../shared/cplusplus/cplusplus.pri)
include(../../shared/cplusplus/cplusplus.pri)
HEADERS += \
SimpleLexer.h \
......
......@@ -7,7 +7,7 @@ QT += xml \
include(../../qworkbenchplugin.pri)
include(../../libs/utils/utils.pri)
include(../../../shared/scriptwrapper/scriptwrapper.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri)
include(coreplugin_dependencies.pri)
INCLUDEPATH += dialogs \
actionmanager \
......
......@@ -12,4 +12,4 @@ SOURCES += cpasterplugin.cpp \
FORMS += settingspage.ui \
pasteselect.ui
include(../../../shared/cpaster/cpaster.pri)
include(../../shared/cpaster/cpaster.pri)
......@@ -3,6 +3,7 @@ TARGET = CppEditor
DEFINES += CPPEDITOR_LIBRARY
CONFIG += help
include(../../libs/utils/utils.pri)
include(../../shared/indenter/indenter.pri)
include(../../qworkbenchplugin.pri)
include(cppeditor_dependencies.pri)
HEADERS += cppplugin.h \
......
......@@ -2,7 +2,7 @@ TEMPLATE = lib
TARGET = Designer
include(../../qworkbenchplugin.pri)
include(../../../shared/designerintegrationv2/designerintegration.pri)
include(../../shared/designerintegrationv2/designerintegration.pri)
include(cpp/cpp.pri)
include(designer_dependencies.pri)
......
......@@ -8,7 +8,7 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../plugins/texteditor/cppeditor.pri)
include(../../../shared/indenter/indenter.pri)
include(../../shared/indenter/indenter.pri)
# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
QT += gui
......
......@@ -30,7 +30,7 @@ SOURCES += helpplugin.cpp \
FORMS += docsettingspage.ui \
filtersettingspage.ui
RESOURCES += help.qrc
include(../../../shared/help/help.pri)
include(../../shared/help/help.pri)
contains(QT_CONFIG, webkit) {
QT += webkit
......
......@@ -4,7 +4,7 @@ QT += xml \
script
include(../../qworkbenchplugin.pri)
include(projectexplorer_dependencies.pri)
include(../../../shared/scriptwrapper/scriptwrapper.pri)
include(../../shared/scriptwrapper/scriptwrapper.pri)
HEADERS += projectexplorer.h \
projectexplorer_export.h \
projectwindow.h \
......
......@@ -93,5 +93,5 @@ FORMS = qtversionmanager.ui \
qt4buildenvironmentwidget.ui
RESOURCES = qt4projectmanager.qrc \
wizards/wizards.qrc
include(../../../shared/proparser/proparser.pri)
include(../../shared/proparser/proparser.pri)
DEFINES += QT_NO_CAST_TO_ASCII
......@@ -3,10 +3,10 @@ TARGET = QtScriptEditor
QT += script
include(../../qworkbenchplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../../shared/qscripthighlighter/qscripthighlighter.pri)
include(../../../shared/indenter/indenter.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../plugins/texteditor/texteditor.pri)
include(../../shared/qscripthighlighter/qscripthighlighter.pri)
include(../../shared/indenter/indenter.pri)
HEADERS += qtscripteditor.h \
qtscripteditorfactory.h \
......
......@@ -6,7 +6,7 @@ qtAddLibrary(QtDesigner)
include(../../qworkbenchplugin.pri)
include(../../libs/utils/utils.pri)
include(../../plugins/coreplugin/coreplugin.pri)
include(../../../shared/qrceditor/qrceditor.pri)
include(../../shared/qrceditor/qrceditor.pri)
INCLUDEPATH += $$PWD/../../tools/utils
......
......@@ -9,5 +9,3 @@ macx {
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
QMAKE_RPATHDIR =
}
File moved
File moved
File moved
File moved
File moved
File moved
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment