forked from qt-creator/qt-creator
Fixes: move all files in shared/* to src/shared/*
This commit is contained in:
hjk
@@ -1,7 +1,7 @@
|
|||||||
IDE_BUILD_TREE = $$OUT_PWD/../../
|
IDE_BUILD_TREE = $$OUT_PWD/../../
|
||||||
|
|
||||||
include(../qworkbench.pri)
|
include(../qworkbench.pri)
|
||||||
include(../../shared/qtsingleapplication/qtsingleapplication.pri)
|
include(../shared/qtsingleapplication/qtsingleapplication.pri)
|
||||||
|
|
||||||
macx {
|
macx {
|
||||||
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
|
CONFIG(debug, debug|release):LIBS *= -lExtensionSystem_debug -lAggregation_debug
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
INCLUDEPATH += $$PWD/../../../shared/cplusplus
|
INCLUDEPATH += $$PWD/../../shared/cplusplus
|
||||||
DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
|
DEFINES += HAVE_QT CPLUSPLUS_WITH_NAMESPACE
|
||||||
LIBS *= -l$$qtLibraryTarget(CPlusPlus)
|
LIBS *= -l$$qtLibraryTarget(CPlusPlus)
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ DEFINES += NDEBUG
|
|||||||
unix:QMAKE_CXXFLAGS_DEBUG += -O3
|
unix:QMAKE_CXXFLAGS_DEBUG += -O3
|
||||||
|
|
||||||
include(../../qworkbenchlibrary.pri)
|
include(../../qworkbenchlibrary.pri)
|
||||||
include(../../../shared/cplusplus/cplusplus.pri)
|
include(../../shared/cplusplus/cplusplus.pri)
|
||||||
|
|
||||||
HEADERS += \
|
HEADERS += \
|
||||||
SimpleLexer.h \
|
SimpleLexer.h \
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ QT += xml \
|
|||||||
|
|
||||||
include(../../qworkbenchplugin.pri)
|
include(../../qworkbenchplugin.pri)
|
||||||
include(../../libs/utils/utils.pri)
|
include(../../libs/utils/utils.pri)
|
||||||
include(../../../shared/scriptwrapper/scriptwrapper.pri)
|
include(../../shared/scriptwrapper/scriptwrapper.pri)
|
||||||
include(coreplugin_dependencies.pri)
|
include(coreplugin_dependencies.pri)
|
||||||
INCLUDEPATH += dialogs \
|
INCLUDEPATH += dialogs \
|
||||||
actionmanager \
|
actionmanager \
|
||||||
|
|||||||
@@ -12,4 +12,4 @@ SOURCES += cpasterplugin.cpp \
|
|||||||
FORMS += settingspage.ui \
|
FORMS += settingspage.ui \
|
||||||
pasteselect.ui
|
pasteselect.ui
|
||||||
|
|
||||||
include(../../../shared/cpaster/cpaster.pri)
|
include(../../shared/cpaster/cpaster.pri)
|
||||||
|
|||||||
@@ -3,6 +3,7 @@ TARGET = CppEditor
|
|||||||
DEFINES += CPPEDITOR_LIBRARY
|
DEFINES += CPPEDITOR_LIBRARY
|
||||||
CONFIG += help
|
CONFIG += help
|
||||||
include(../../libs/utils/utils.pri)
|
include(../../libs/utils/utils.pri)
|
||||||
|
include(../../shared/indenter/indenter.pri)
|
||||||
include(../../qworkbenchplugin.pri)
|
include(../../qworkbenchplugin.pri)
|
||||||
include(cppeditor_dependencies.pri)
|
include(cppeditor_dependencies.pri)
|
||||||
HEADERS += cppplugin.h \
|
HEADERS += cppplugin.h \
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ TEMPLATE = lib
|
|||||||
TARGET = Designer
|
TARGET = Designer
|
||||||
|
|
||||||
include(../../qworkbenchplugin.pri)
|
include(../../qworkbenchplugin.pri)
|
||||||
include(../../../shared/designerintegrationv2/designerintegration.pri)
|
include(../../shared/designerintegrationv2/designerintegration.pri)
|
||||||
include(cpp/cpp.pri)
|
include(cpp/cpp.pri)
|
||||||
include(designer_dependencies.pri)
|
include(designer_dependencies.pri)
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ include(../../plugins/projectexplorer/projectexplorer.pri)
|
|||||||
include(../../plugins/coreplugin/coreplugin.pri)
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
include(../../plugins/texteditor/texteditor.pri)
|
include(../../plugins/texteditor/texteditor.pri)
|
||||||
include(../../plugins/texteditor/cppeditor.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
|
# DEFINES += QT_NO_CAST_FROM_ASCII QT_NO_CAST_TO_ASCII
|
||||||
QT += gui
|
QT += gui
|
||||||
|
|||||||
@@ -30,7 +30,7 @@ SOURCES += helpplugin.cpp \
|
|||||||
FORMS += docsettingspage.ui \
|
FORMS += docsettingspage.ui \
|
||||||
filtersettingspage.ui
|
filtersettingspage.ui
|
||||||
RESOURCES += help.qrc
|
RESOURCES += help.qrc
|
||||||
include(../../../shared/help/help.pri)
|
include(../../shared/help/help.pri)
|
||||||
|
|
||||||
contains(QT_CONFIG, webkit) {
|
contains(QT_CONFIG, webkit) {
|
||||||
QT += webkit
|
QT += webkit
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ QT += xml \
|
|||||||
script
|
script
|
||||||
include(../../qworkbenchplugin.pri)
|
include(../../qworkbenchplugin.pri)
|
||||||
include(projectexplorer_dependencies.pri)
|
include(projectexplorer_dependencies.pri)
|
||||||
include(../../../shared/scriptwrapper/scriptwrapper.pri)
|
include(../../shared/scriptwrapper/scriptwrapper.pri)
|
||||||
HEADERS += projectexplorer.h \
|
HEADERS += projectexplorer.h \
|
||||||
projectexplorer_export.h \
|
projectexplorer_export.h \
|
||||||
projectwindow.h \
|
projectwindow.h \
|
||||||
|
|||||||
@@ -93,5 +93,5 @@ FORMS = qtversionmanager.ui \
|
|||||||
qt4buildenvironmentwidget.ui
|
qt4buildenvironmentwidget.ui
|
||||||
RESOURCES = qt4projectmanager.qrc \
|
RESOURCES = qt4projectmanager.qrc \
|
||||||
wizards/wizards.qrc
|
wizards/wizards.qrc
|
||||||
include(../../../shared/proparser/proparser.pri)
|
include(../../shared/proparser/proparser.pri)
|
||||||
DEFINES += QT_NO_CAST_TO_ASCII
|
DEFINES += QT_NO_CAST_TO_ASCII
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ TARGET = QtScriptEditor
|
|||||||
QT += script
|
QT += script
|
||||||
|
|
||||||
include(../../qworkbenchplugin.pri)
|
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/coreplugin/coreplugin.pri)
|
||||||
|
include(../../plugins/texteditor/texteditor.pri)
|
||||||
|
include(../../shared/qscripthighlighter/qscripthighlighter.pri)
|
||||||
|
include(../../shared/indenter/indenter.pri)
|
||||||
|
|
||||||
HEADERS += qtscripteditor.h \
|
HEADERS += qtscripteditor.h \
|
||||||
qtscripteditorfactory.h \
|
qtscripteditorfactory.h \
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ qtAddLibrary(QtDesigner)
|
|||||||
include(../../qworkbenchplugin.pri)
|
include(../../qworkbenchplugin.pri)
|
||||||
include(../../libs/utils/utils.pri)
|
include(../../libs/utils/utils.pri)
|
||||||
include(../../plugins/coreplugin/coreplugin.pri)
|
include(../../plugins/coreplugin/coreplugin.pri)
|
||||||
include(../../../shared/qrceditor/qrceditor.pri)
|
include(../../shared/qrceditor/qrceditor.pri)
|
||||||
|
|
||||||
INCLUDEPATH += $$PWD/../../tools/utils
|
INCLUDEPATH += $$PWD/../../tools/utils
|
||||||
|
|
||||||
|
|||||||
@@ -9,5 +9,3 @@ macx {
|
|||||||
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
|
QMAKE_LFLAGS += -Wl,-z,origin \'-Wl,-rpath,$${IDE_PLUGIN_RPATH}\'
|
||||||
QMAKE_RPATHDIR =
|
QMAKE_RPATHDIR =
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user