Sign Up
Log In
Log In
or
Sign Up
Places
All Projects
Status Monitor
Collapse sidebar
home:pascom
qtcreator-clang
008-clang_only-4.12.1.patch
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File 008-clang_only-4.12.1.patch of Package qtcreator-clang
diff -uprN qt-creator-opensource-src-4.12.1-orig/qtcreator.pro qt-creator-opensource-src-4.12.1/qtcreator.pro --- qt-creator-opensource-src-4.12.1-orig/qtcreator.pro 2020-05-19 04:15:36.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/qtcreator.pro 2020-06-01 11:28:21.192927899 +0200 @@ -11,7 +11,7 @@ include(doc/doc.pri) TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = src share +SUBDIRS = src unix:!macx:!isEmpty(copydata):SUBDIRS += bin !isEmpty(BUILD_TESTS):SUBDIRS += tests @@ -24,68 +24,6 @@ DISTFILES += dist/copyright_template.txt $$files(scripts/*.sh) \ $$files(scripts/*.pl) -exists(src/shared/qbs/qbs.pro) { - # Make sure the qbs dll ends up alongside the Creator executable. - QBS_DLLDESTDIR = $${IDE_BUILD_TREE}/bin - cache(QBS_DLLDESTDIR) - QBS_DESTDIR = $${IDE_LIBRARY_PATH} - cache(QBS_DESTDIR) - QBSLIBDIR = $${IDE_LIBRARY_PATH} - cache(QBSLIBDIR) - QBS_INSTALL_PREFIX = $${QTC_PREFIX} - cache(QBS_INSTALL_PREFIX) - QBS_LIB_INSTALL_DIR = $$INSTALL_LIBRARY_PATH - cache(QBS_LIB_INSTALL_DIR) - QBS_RESOURCES_BUILD_DIR = $${IDE_DATA_PATH}/qbs - cache(QBS_RESOURCES_BUILD_DIR) - QBS_RESOURCES_INSTALL_DIR = $$INSTALL_DATA_PATH/qbs - cache(QBS_RESOURCES_INSTALL_DIR) - macx { - QBS_PLUGINS_BUILD_DIR = $${IDE_PLUGIN_PATH} - QBS_APPS_RPATH_DIR = @loader_path/../Frameworks - } else { - QBS_PLUGINS_BUILD_DIR = $$IDE_PLUGIN_PATH - QBS_APPS_RPATH_DIR = \$\$ORIGIN/../$$IDE_LIBRARY_BASENAME/qtcreator - } - cache(QBS_PLUGINS_BUILD_DIR) - cache(QBS_APPS_RPATH_DIR) - QBS_PLUGINS_INSTALL_DIR = $$INSTALL_PLUGIN_PATH - cache(QBS_PLUGINS_INSTALL_DIR) - QBS_LIBRARY_DIRNAME = $${IDE_LIBRARY_BASENAME} - cache(QBS_LIBRARY_DIRNAME) - QBS_APPS_DESTDIR = $${IDE_BIN_PATH} - cache(QBS_APPS_DESTDIR) - QBS_APPS_INSTALL_DIR = $$INSTALL_BIN_PATH - cache(QBS_APPS_INSTALL_DIR) - QBS_LIBEXEC_DESTDIR = $${IDE_LIBEXEC_PATH} - cache(QBS_LIBEXEC_DESTDIR) - QBS_LIBEXEC_INSTALL_DIR = $$INSTALL_LIBEXEC_PATH - cache(QBS_LIBEXEC_INSTALL_DIR) - QBS_RELATIVE_LIBEXEC_PATH = $$relative_path($$QBS_LIBEXEC_DESTDIR, $$QBS_APPS_DESTDIR) - isEmpty(QBS_RELATIVE_LIBEXEC_PATH):QBS_RELATIVE_LIBEXEC_PATH = . - cache(QBS_RELATIVE_LIBEXEC_PATH) - QBS_RELATIVE_PLUGINS_PATH = $$relative_path($$QBS_PLUGINS_BUILD_DIR, $$QBS_APPS_DESTDIR$$) - cache(QBS_RELATIVE_PLUGINS_PATH) - QBS_RELATIVE_SEARCH_PATH = $$relative_path($$QBS_RESOURCES_BUILD_DIR, $$QBS_APPS_DESTDIR) - cache(QBS_RELATIVE_SEARCH_PATH) - !qbs_no_dev_install { - QBS_CONFIG_ADDITION = qbs_no_dev_install qbs_enable_project_file_updates - cache(CONFIG, add, QBS_CONFIG_ADDITION) - } - - # Create qbs documentation targets. - DOC_FILES = - DOC_TARGET_PREFIX = qbs_ - include(src/shared/qbs/doc/doc_shared.pri) - include(src/shared/qbs/doc/doc_targets.pri) - docs.depends += qbs_docs - !build_online_docs { - install_docs.depends += install_qbs_docs - } - unset(DOC_FILES) - unset(DOC_TARGET_PREFIX) -} - contains(QT_ARCH, i386): ARCHITECTURE = x86 else: ARCHITECTURE = $$QT_ARCH @@ -96,65 +34,3 @@ else: PLATFORM = "unknown" BASENAME = $$(INSTALL_BASENAME) isEmpty(BASENAME): BASENAME = qt-creator-$${PLATFORM}$(INSTALL_EDITION)-$${QTCREATOR_VERSION}$(INSTALL_POSTFIX) - -linux { - appstream.files = share/metainfo/org.qt-project.qtcreator.appdata.xml - appstream.path = $$QTC_PREFIX/share/metainfo/ - - desktop.files = share/applications/org.qt-project.qtcreator.desktop - desktop.path = $$QTC_PREFIX/share/applications/ - - INSTALLS += appstream desktop -} - -macx { - APPBUNDLE = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.app" - BINDIST_SOURCE.release = "$$OUT_PWD/bin/$${IDE_APP_TARGET}.app" - BINDIST_SOURCE.debug = "$$OUT_PWD/bin" - BINDIST_EXCLUDE_ARG.debug = "--exclude-toplevel" - deployqt.commands = $$PWD/scripts/deployqtHelper_mac.sh \"$${APPBUNDLE}\" \"$$[QT_INSTALL_BINS]\" \"$$[QT_INSTALL_TRANSLATIONS]\" \"$$[QT_INSTALL_PLUGINS]\" \"$$[QT_INSTALL_IMPORTS]\" \"$$[QT_INSTALL_QML]\" - codesign.commands = codesign --deep -o runtime -s \"$(SIGNING_IDENTITY)\" $(SIGNING_FLAGS) \"$${APPBUNDLE}\" - dmg.commands = python -u \"$$PWD/scripts/makedmg.py\" \"$${BASENAME}.dmg\" \"Qt Creator\" \"$$IDE_SOURCE_TREE\" \"$$OUT_PWD/bin\" - #dmg.depends = deployqt - QMAKE_EXTRA_TARGETS += codesign dmg -} else { - BINDIST_SOURCE.release = "$(INSTALL_ROOT)$$QTC_PREFIX" - BINDIST_EXCLUDE_ARG.release = "--exclude-toplevel" - BINDIST_SOURCE.debug = $${BINDIST_SOURCE.release} - BINDIST_EXCLUDE_ARG.debug = $${BINDIST_EXCLUDE_ARG.release} - deployqt.commands = python -u $$PWD/scripts/deployqt.py -i \"$(INSTALL_ROOT)$$QTC_PREFIX/bin/$${IDE_APP_TARGET}\" \"$(QMAKE)\" - deployqt.depends = install - win32:!isEmpty(BINARY_ARTIFACTS_BRANCH) { - deployartifacts.depends = install - deployartifacts.commands = git clone --depth 1 -b $$BINARY_ARTIFACTS_BRANCH \ - "http://code.qt.io/qt-creator/binary-artifacts.git" \ - && xcopy /s /q /y /i "binary-artifacts\\win32" \"$(INSTALL_ROOT)$$QTC_PREFIX\" \ - && rmdir /s /q binary-artifacts - QMAKE_EXTRA_TARGETS += deployartifacts - } -} - -INSTALLER_ARCHIVE_FROM_ENV = $$(INSTALLER_ARCHIVE) -isEmpty(INSTALLER_ARCHIVE_FROM_ENV) { - INSTALLER_ARCHIVE = $$OUT_PWD/$${BASENAME}-installer-archive.7z -} else { - INSTALLER_ARCHIVE = $$OUT_PWD/$$(INSTALLER_ARCHIVE) -} - -INSTALLER_ARCHIVE_DEBUG = $$INSTALLER_ARCHIVE -INSTALLER_ARCHIVE_DEBUG ~= s/(.*)[.]7z/\1-debug.7z - -bindist.commands = python -u $$PWD/scripts/createDistPackage.py $$OUT_PWD/$${BASENAME}.7z \"$${BINDIST_SOURCE.release}\" -bindist_installer.commands = python -u $$PWD/scripts/createDistPackage.py $${BINDIST_EXCLUDE_ARG.release} $${INSTALLER_ARCHIVE} \"$${BINDIST_SOURCE.release}\" -bindist_debug.commands = python -u $$PWD/scripts/createDistPackage.py --debug $${BINDIST_EXCLUDE_ARG.debug} $${INSTALLER_ARCHIVE_DEBUG} \"$${BINDIST_SOURCE.debug}\" - -win32 { - deployqt.commands ~= s,/,\\\\,g - bindist.commands ~= s,/,\\\\,g - bindist_installer.commands ~= s,/,\\\\,g -} - -deployqt.CONFIG += recursive -deployqt.recurse = src - -QMAKE_EXTRA_TARGETS += deployqt bindist bindist_installer bindist_debug diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/clangactivationsequencecontextprocessor.h 2020-06-01 11:21:29.876508058 +0200 @@ -25,7 +25,7 @@ #pragma once -#include <clangcodemodel/clangcompletionassistinterface.h> +#include "clangcompletionassistinterface.h" #include <cplusplus/Token.h> diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/clangcodemodel.pro qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/clangcodemodel.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/clangcodemodel.pro 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/clangcodemodel.pro 2020-06-01 11:21:29.876508058 +0200 @@ -1,4 +1,10 @@ -include(../../qtcreatorplugin.pri) +# Qt Creator source tree: +isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=/usr/include/qtcreator +# Qt Creator lib path: +isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/usr + +#include(../../qtcreatorplugin.pri) +include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_defines.pri) diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/test/clangbatchfileprocessor.cpp 2020-06-01 11:21:29.876508058 +0200 @@ -27,7 +27,7 @@ #include "clangautomationutils.h" -#include <clangcodemodel/clangeditordocumentprocessor.h> +#include "../clangeditordocumentprocessor.h" #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangcodemodel/test/clangcodecompletion_test.cpp 2020-06-01 11:21:29.880508023 +0200 @@ -29,7 +29,7 @@ #include "../clangcompletionassistinterface.h" #include "../clangmodelmanagersupport.h" -#include <clangcodemodel/clangeditordocumentprocessor.h> +#include "../clangeditordocumentprocessor.h" #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditor.h> diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangformat/clangformat.pro qt-creator-opensource-src-4.12.1/src/plugins/clangformat/clangformat.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangformat/clangformat.pro 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangformat/clangformat.pro 2020-06-01 11:21:29.880508023 +0200 @@ -1,4 +1,9 @@ -include(../../qtcreatorplugin.pri) +# Qt Creator source tree: +isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=/usr/include/qtcreator +# Qt Creator lib path: +isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/usr +#include(../../qtcreatorplugin.pri) +include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include(clangformat-source.pri) include(../../shared/clang/clang_installation.pri) diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangpchmanager/clangpchmanager.pro qt-creator-opensource-src-4.12.1/src/plugins/clangpchmanager/clangpchmanager.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangpchmanager/clangpchmanager.pro 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangpchmanager/clangpchmanager.pro 2020-06-01 11:21:29.880508023 +0200 @@ -1,4 +1,10 @@ -include(../../qtcreatorplugin.pri) +# Qt Creator source tree: +isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=/usr/include/qtcreator +# Qt Creator lib path: +isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/usr + +#include(../../qtcreatorplugin.pri) +include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include(clangpchmanager-source.pri) include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_defines.pri) diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangrefactoring/clangrefactoring.pro qt-creator-opensource-src-4.12.1/src/plugins/clangrefactoring/clangrefactoring.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangrefactoring/clangrefactoring.pro 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangrefactoring/clangrefactoring.pro 2020-06-01 11:21:29.880508023 +0200 @@ -1,4 +1,10 @@ -include(../../qtcreatorplugin.pri) +# Qt Creator source tree: +isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=/usr/include/qtcreator +# Qt Creator lib path: +isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/usr + +#include(../../qtcreatorplugin.pri) +include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include(clangrefactoring-source.pri) include(../../shared/clang/clang_installation.pri) @@ -6,6 +12,8 @@ include(../../shared/clang/clang_defines requires(!isEmpty(LIBTOOLING_LIBS)) +LIBS += -L../clangpchmanager/bin/ + HEADERS += \ clangrefactoringplugin.h \ baseclangquerytexteditorwidget.h \ diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/clangtools/clangtools.pro qt-creator-opensource-src-4.12.1/src/plugins/clangtools/clangtools.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/clangtools/clangtools.pro 2020-05-19 04:15:34.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/clangtools/clangtools.pro 2020-06-01 11:21:29.880508023 +0200 @@ -1,4 +1,10 @@ -include(../../qtcreatorplugin.pri) +# Qt Creator source tree: +isEmpty(QTCREATOR_SOURCES):QTCREATOR_SOURCES=/usr/include/qtcreator +# Qt Creator lib path: +isEmpty(IDE_BUILD_TREE):IDE_BUILD_TREE=/usr + +#include(../../qtcreatorplugin.pri) +include($$QTCREATOR_SOURCES/src/qtcreatorplugin.pri) include(../../shared/clang/clang_installation.pri) include(../../shared/clang/clang_defines.pri) diff -uprN qt-creator-opensource-src-4.12.1-orig/src/plugins/plugins.pro qt-creator-opensource-src-4.12.1/src/plugins/plugins.pro --- qt-creator-opensource-src-4.12.1-orig/src/plugins/plugins.pro 2020-05-19 04:15:35.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/plugins/plugins.pro 2020-06-01 11:30:38.507757746 +0200 @@ -3,115 +3,8 @@ include(../../qtcreator.pri) TEMPLATE = subdirs SUBDIRS = \ - autotest \ clangformat \ clangtools \ - coreplugin \ - texteditor \ - cppeditor \ - bineditor \ - boot2qt \ - diffeditor \ - imageviewer \ - bookmarks \ - projectexplorer \ - vcsbase \ - perforce \ - subversion \ - git \ - cvs \ - cpptools \ - qtsupport \ - qmakeprojectmanager \ - debugger \ - cpaster \ - cmakeprojectmanager \ - autotoolsprojectmanager \ - fakevim \ - emacskeys \ - resourceeditor \ - genericprojectmanager \ - qmljseditor \ - qmlprojectmanager \ - glsleditor \ - python \ - nim \ - mercurial \ - bazaar \ - classview \ - tasklist \ - qmljstools \ - macros \ - remotelinux \ - android \ - valgrind \ - todo \ - qnx \ - clearcase \ - baremetal \ - ios \ - beautifier \ - modeleditor \ - winrt \ - updateinfo \ - scxmleditor \ - welcome \ - silversearcher \ - languageclient \ - cppcheck \ - compilationdatabaseprojectmanager \ - qmlpreview \ - studiowelcome \ - webassembly \ - mcusupport \ - marketplace - -qtHaveModule(serialport) { - SUBDIRS += serialterminal -} else { - warning("SerialTerminal plugin has been disabled since the Qt SerialPort module is not available.") -} - -qtHaveModule(quick) { - SUBDIRS += qmlprofiler perfprofiler ctfvisualizer -} else { - warning("QmlProfiler, PerfProfiler and CTF Visualizer plugins have been disabled since the Qt Quick module is not available.") -} - -qtHaveModule(help) { - SUBDIRS += help -} else { - warning("Help plugin has been disabled since the Qt Help module is not available.") -} - -qtHaveModule(designercomponents_private) { - SUBDIRS += designer -} else { - warning("Qt Widget Designer plugin has been disabled since the Qt Designer module is not available.") -} - -QTC_DO_NOT_BUILD_QMLDESIGNER = $$(QTC_DO_NOT_BUILD_QMLDESIGNER) -isEmpty(QTC_DO_NOT_BUILD_QMLDESIGNER):qtHaveModule(quick-private) { - exists($$[QT_INSTALL_QML]/QtQuick/Controls/qmldir) { - SUBDIRS += qmldesigner - } else { - warning("QmlDesigner plugin has been disabled since Qt Quick Controls 1 are not installed.") - } -} else { - !qtHaveModule(quick-private) { - warning("QmlDesigner plugin has been disabled since the Qt Quick module is not available.") - } else { - warning("QmlDesigner plugin has been disabled since QTC_DO_NOT_BUILD_QMLDESIGNER is set.") - } -} - - -isEmpty(QBS_INSTALL_DIR): QBS_INSTALL_DIR = $$(QBS_INSTALL_DIR) -exists(../shared/qbs/qbs.pro)|!isEmpty(QBS_INSTALL_DIR): \ - SUBDIRS += \ - qbsprojectmanager - -SUBDIRS += \ clangcodemodel QTC_DISABLE_CLANG_REFACTORING=$$(QTC_DISABLE_CLANG_REFACTORING) @@ -120,20 +13,15 @@ isEmpty(QTC_DISABLE_CLANG_REFACTORING) { SUBDIRS += clangpchmanager } -isEmpty(IDE_PACKAGE_MODE) { - SUBDIRS += \ - helloworld -} - for(p, SUBDIRS) { QTC_PLUGIN_DEPENDS = include($$p/$${p}_dependencies.pri) - pv = $${p}.depends - $$pv = $$QTC_PLUGIN_DEPENDS -} + # Dependencies must be filtered to keep only built dependencies: + message("Before filtering dependencies: $$QTC_PLUGIN_DEPENDS") + filteredDeps = + for (d, QTC_PLUGIN_DEPENDS): contains(SUBDIRS, $$d): filteredDeps += $$d + message("After filtering dependencies: $$filteredDeps") -linux-* { - SUBDIRS += debugger/ptracepreload.pro + pv = $${p}.depends + $$pv = $$filteredDeps } - -QMAKE_EXTRA_TARGETS += deployqt # dummy diff -uprN qt-creator-opensource-src-4.12.1-orig/src/src.pro qt-creator-opensource-src-4.12.1/src/src.pro --- qt-creator-opensource-src-4.12.1-orig/src/src.pro 2020-05-19 04:15:36.000000000 +0200 +++ qt-creator-opensource-src-4.12.1/src/src.pro 2020-06-01 11:21:29.880508023 +0200 @@ -2,15 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS += \ - shared \ - libs \ - app \ - plugins \ - tools \ - share/qtcreator/data.pro \ - share/3rdparty/data.pro - -# delegate deployqt target -deployqt.CONFIG += recursive -deployqt.recurse = shared libs app plugins tools -QMAKE_EXTRA_TARGETS += deployqt + plugins
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Code of Conduct
Contact
Support
@OBShq
Terms
openSUSE Build Service is sponsored by
The Open Build Service is an
openSUSE project
.
Sign Up
Log In
Places
Places
All Projects
Status Monitor
