diff options
| author | Nikolai Kosjar <nikolai.kosjar@theqtcompany.com> | 2015-06-17 16:57:35 +0200 |
|---|---|---|
| committer | Marco Bubke <marco.bubke@theqtcompany.com> | 2015-06-17 15:59:15 +0000 |
| commit | 8131aea4f9301fd050a9dfc6141cde8205798b56 (patch) | |
| tree | 8684219accb65f7e8da0a9b8cf8f75fdaf83955f | |
| parent | a2d48676e6272258caf01f4a17dd3405ca7c80c9 (diff) | |
Clang: Use qtcreatortool.pri in clangbackend.pro
Change-Id: Ia33e7265e103aed04d18b23ae8d02d4e403aae8b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
| -rw-r--r-- | src/tools/clangbackend/clangbackend.pri | 26 | ||||
| -rw-r--r-- | src/tools/clangbackend/clangbackend.pro | 22 |
2 files changed, 18 insertions, 30 deletions
diff --git a/src/tools/clangbackend/clangbackend.pri b/src/tools/clangbackend/clangbackend.pri deleted file mode 100644 index 099c969089..0000000000 --- a/src/tools/clangbackend/clangbackend.pri +++ /dev/null @@ -1,26 +0,0 @@ -QTC_LIB_DEPENDS += \ - sqlite \ - clangbackendipc - -QT += core network -QT -= gui - -TARGET = clangbackend -CONFIG += console -CONFIG -= app_bundle C++-14 - -TEMPLATE = app - -include(ipcsource/clangbackendclangipc-source.pri) -include(../../../qtcreator.pri) -include(../../shared/clang/clang_installation.pri) -include(../../rpath.pri) - -LIBS += $$LLVM_LIBS -INCLUDEPATH += $$LLVM_INCLUDEPATH - -SOURCES += clangbackendmain.cpp - -osx { - QMAKE_LFLAGS += -Wl,-rpath,$${LLVM_LIBDIR} -} diff --git a/src/tools/clangbackend/clangbackend.pro b/src/tools/clangbackend/clangbackend.pro index eae95c5d92..232c6ed81b 100644 --- a/src/tools/clangbackend/clangbackend.pro +++ b/src/tools/clangbackend/clangbackend.pro @@ -1,5 +1,19 @@ -include(clangbackend.pri) +QTC_LIB_DEPENDS += \ + sqlite \ + clangbackendipc -DESTDIR = $$IDE_LIBEXEC_PATH -target.path = $$QTC_PREFIX/bin # FIXME: libexec, more or less -INSTALLS += target +include(../../qtcreatortool.pri) +include(../../shared/clang/clang_installation.pri) +include(ipcsource/clangbackendclangipc-source.pri) + +QT += core network +QT -= gui + +LIBS += $$LLVM_LIBS +INCLUDEPATH += $$LLVM_INCLUDEPATH + +SOURCES += clangbackendmain.cpp + +osx { + QMAKE_LFLAGS += -Wl,-rpath,$${LLVM_LIBDIR} +} |