Hello community, here is the log from the commit of package libqt5-creator for openSUSE:Factory checked in at 2020-08-28 21:19:28 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-creator (Old) and /work/SRC/openSUSE:Factory/.libqt5-creator.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-creator" Fri Aug 28 21:19:28 2020 rev:80 rq:829987 version:4.13.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-creator/libqt5-creator.changes 2020-06-10 00:52:10.575534582 +0200 +++ /work/SRC/openSUSE:Factory/.libqt5-creator.new.3399/libqt5-creator.changes 2020-08-28 21:21:16.456321670 +0200 @@ -1,0 +2,29 @@ +Thu Aug 27 11:10:09 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 4.13.0 + https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-4.13.0.md + +------------------------------------------------------------------- +Thu Aug 6 07:37:15 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 4.13.0-beta2 + https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-4.13.0.md +- Drop 0001-Fix-build-with-yaml-cpp-installed-and-CMake-3.11.patch + Merged upstream + +------------------------------------------------------------------- +Tue Jul 14 12:39:11 UTC 2020 - Christophe Giboudeaux <christo...@krop.fr> + +- Update to 4.13.0-beta1 + https://code.qt.io/cgit/qt-creator/qt-creator.git/tree/dist/changes-4.13.0.md +- Use CMake for building qt-creator +- Update 0001-Fix-build-with-openSUSE-clang9-package.patch +- Add 0001-Disable-some-plugins.patch to disable building of three plugins: + * updateinfo works when using the Qt installer + * clangformat requires a Clang patch which was never accepted + upstream + * qlitehtml has installation issues. +- Add patch to fix build with CMake < 3.11: + * 0001-Fix-build-with-yaml-cpp-installed-and-CMake-3.11.patch + +------------------------------------------------------------------- Old: ---- qt-creator-opensource-src-4.12.2.tar.xz New: ---- 0001-Disable-some-plugins.patch qt-creator-opensource-src-4.13.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-creator.spec ++++++ --- /var/tmp/diff_new_pack.LmuY1r/_old 2020-08-28 21:21:19.296323048 +0200 +++ /var/tmp/diff_new_pack.LmuY1r/_new 2020-08-28 21:21:19.300323050 +0200 @@ -1,7 +1,7 @@ # # spec file for package libqt5-creator # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,73 +16,92 @@ # # Enable the clangcodemodel plugin on openSUSE TW and Leap 15.2+, which have LLVM >= 8.0. -%global build_clang_backend 0 -%ifarch %arm aarch64 %ix86 x86_64 +%ifarch %{arm} aarch64 %{ix86} x86_64 %if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 %global build_clang_backend 1 %endif %endif - +%define major_ver 4.13 +%define qt5_version 5.12.0 +%define tar_version 4.13.0 Name: libqt5-creator -Version: 4.12.2 +Version: 4.13.0 Release: 0 Summary: Integrated Development Environment targeting Qt apps # src/plugins/cmakeprojectmanager/configmodelitemdelegate.* -> LGPL-2.1-only OR LGPL-3.0-only -# src/shared/qbs/src/plugins/generator/visualstudio -> LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only +# src/shared/qbs is not built +# src/plugins/help/qlitehtml/litehtml and src/plugins/help/qlitehtml/litehtml/src/gumbo are not built # src/plugins/imageviewer/imageview.cpp, src/plugins/vcsbase/wizard/vcsconfigurationpage.cpp -> BSD-3-Clause # src/plugins/emacskeys/* -> GPL-3.0-only # src/libs/3rdparty/syntax-highlighting -> MIT # many files are dual licensed 'LGPL-3.0-only or (GPL-2.0-or-later OR GPL-3.0-or-later + KDE Free Qt Foundation option)', we'll use LGPL-3.0-only for these files -License: GPL-3.0-with-Qt-Company-Qt-exception-1.1 AND (LGPL-2.1-with-Qt-Company-Qt-exception-1.1 OR LGPL-3.0-only) AND (LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only AND LGPL-3.0-only AND MIT AND BSD-3-Clause +License: GPL-3.0-with-Qt-Company-Qt-exception-1.1 AND (LGPL-2.1-only OR LGPL-3.0-only) AND GPL-3.0-only AND LGPL-3.0-only AND MIT AND BSD-3-Clause Group: Development/Tools/IDE -Url: https://www.qt.io/ide/ -%define major_ver 4.12 -%define qt5_version 5.11.0 -%define tar_version 4.12.2 +URL: https://www.qt.io/ide/ Source: https://download.qt.io/official_releases/qtcreator/%{major_ver}/%{tar_version}/qt-creator-opensource-src-%{tar_version}.tar.xz Source1: %{name}-rpmlintrc # PATCH-FIX-OPENSUSE Patch0: 0001-Fix-build-with-openSUSE-clang9-package.patch # PATCH-FIX-OPENSUSE Patch1: fix-application-output.patch -BuildRequires: gdb -BuildRequires: libQt5Sql5-sqlite >= %{qt5_version} -BuildRequires: libbotan-devel -BuildRequires: libqt5-qtbase-devel >= %{qt5_version} +# PATCH-FIX-OPENSUSE +Patch2: 0001-Disable-some-plugins.patch +BuildRequires: cmake +BuildRequires: libqt5-qtbase-private-headers-devel >= %{qt5_version} BuildRequires: libqt5-qtdeclarative-private-headers-devel >= %{qt5_version} -BuildRequires: libqt5-qtquickcontrols >= %{qt5_version} -BuildRequires: libqt5-qtscript-devel >= %{qt5_version} -BuildRequires: libqt5-qttools-doc +BuildRequires: libqt5-qtquick3d-private-headers-devel >= %{qt5_version} BuildRequires: libqt5-qttools-private-headers-devel >= %{qt5_version} -%ifnarch ppc ppc64 ppc64le s390 s390x -BuildRequires: libqt5-qtwebengine-devel >= %{qt5_version} -%endif -BuildRequires: libqt5-qtx11extras-devel >= %{qt5_version} +BuildRequires: pkgconfig +BuildRequires: python3 >= 3.5 # Needs an internal patched version :-/ # BuildRequires: cmake(KF5SyntaxHighlighting) -%if %{build_clang_backend} -BuildRequires: llvm-clang-devel >= 8.0 -# clangcodemodel hardcodes clang include paths: QTCREATORBUG-21972 -%requires_eq libclang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) -%endif -BuildRequires: update-desktop-files -BuildRequires: xz -Provides: qt-creator = %{version} -Obsoletes: qt-creator < %{version} -Recommends: libqt5-qtbase-common-devel -Recommends: libqt5-qtdoc-qch -Recommends: libqt5-qtbase-devel -Recommends: libqt5-qtdeclarative-devel -Recommends: libqt5-qtquick1-devel -Recommends: libqt5-qttranslations +BuildRequires: cmake(Qt5Concurrent) >= %{qt5_version} +BuildRequires: cmake(Qt5Core) >= %{qt5_version} +BuildRequires: cmake(Qt5Designer) >= %{qt5_version} +BuildRequires: cmake(Qt5DocTools) >= %{qt5_version} +BuildRequires: cmake(Qt5Gui) >= %{qt5_version} +BuildRequires: cmake(Qt5Help) >= %{qt5_version} +BuildRequires: cmake(Qt5LinguistTools) >= %{qt5_version} +BuildRequires: cmake(Qt5Network) >= %{qt5_version} +BuildRequires: cmake(Qt5PrintSupport) >= %{qt5_version} +BuildRequires: cmake(Qt5Qml) >= %{qt5_version} +BuildRequires: cmake(Qt5Quick) >= %{qt5_version} +BuildRequires: cmake(Qt5Quick3D) >= %{qt5_version} +BuildRequires: cmake(Qt5Quick3DAssetImport) >= %{qt5_version} +BuildRequires: cmake(Qt5QuickWidgets) >= %{qt5_version} +BuildRequires: cmake(Qt5Script) >= %{qt5_version} +BuildRequires: cmake(Qt5SerialPort) >= %{qt5_version} +BuildRequires: cmake(Qt5Sql) >= %{qt5_version} +BuildRequires: cmake(Qt5Svg) >= %{qt5_version} +BuildRequires: cmake(Qt5Widgets) >= %{qt5_version} +BuildRequires: cmake(Qt5Xml) >= %{qt5_version} +BuildRequires: cmake(yaml-cpp) +BuildRequires: pkgconfig(libelf) +BuildRequires: pkgconfig(libdw) Requires: libqt5-qtquickcontrols -Suggests: git-core - # Make sure to rebuild against latest Qt5 (using the last package in chain - libQt5Designer5) # Explicitly require libQt5Script5 (needed by plugins). Qt Creator crashes with old versions on project load. %requires_eq libQt5Designer5 %requires_eq libQt5DesignerComponents5 %requires_eq libQt5Script5 +Recommends: libqt5-qtbase-common-devel +Recommends: libqt5-qtbase-devel +Recommends: libqt5-qtdeclarative-devel +Recommends: libqt5-qtdoc-qch +Recommends: libqt5-qtquick1-devel +Recommends: libqt5-qttranslations +Provides: qt-creator = %{version} +Obsoletes: qt-creator < %{version} +%if 0%{?build_clang_backend} +BuildRequires: clang-devel >= 8.0 +BuildRequires: llvm-devel +# clangcodemodel hardcodes clang include paths: QTCREATORBUG-21972 +%requires_eq libclang%(rpm -q --qf '%''{version}' clang-devel | cut -d. -f1) +%endif +%ifnarch ppc ppc64 ppc64le s390 s390x +BuildRequires: cmake(Qt5WebEngine) >= %{qt5_version} +BuildRequires: cmake(Qt5WebEngineWidgets) >= %{qt5_version} +%endif %description Qt Creator is an integrated development environment (IDE) designed to @@ -100,42 +119,59 @@ %prep %autosetup -p1 -n qt-creator-opensource-src-%{tar_version} -# We have a separate package for qbs -rm -r src/shared/qbs + +# E: spurious-executable-perm +chmod -x doc/qtcreator/images/qtcreator-cmakeexecutable.png %build %define _lto_cflags %{nil} -sed -i s,libexec/qtcreator,%{_lib}/qtcreator/libexec,g qtcreator.qbs -sed -i 's,libexec/qtcreator,$$IDE_LIBRARY_BASENAME/qtcreator/libexec,g' qtcreator.pri # https://bugzilla.opensuse.org/962650 -sed -i s,libexec/qtcreator,%{_lib}/qtcreator/libexec,g src/plugins/coreplugin/icore.cpp +sed -i 's#libexec/\${IDE_ID}#lib/\${IDE_ID}/libexec#' cmake/QtCreatorAPIInternal.cmake -export QBS_INSTALL_DIR=%{_bindir} +%if "%{_lib}" == "lib64" +sed -i 's#lib/#lib64/#g' cmake/QtCreatorAPIInternal.cmake +%endif -opts="IDE_LIBRARY_BASENAME=%{_lib}" -opts="$opts CONFIG+=use_system_botan" +# https://bugreports.qt.io/browse/QTCREATORBUG-24357 suggests disabling +# the clangpchmanagerbackend and clangrefactoringbackend builds +%cmake \ + -DBUILD_WITH_PCH=OFF \ + -DWITH_DOCS=ON \ + -DBUILD_EXECUTABLE_CLANGPCHMANAGERBACKEND=OFF \ + -DBUILD_EXECUTABLE_CLANGREFACTORINGBACKEND=OFF -%qmake5 $opts -make %{?_smp_mflags} -make qch_docs -make html_docs +%cmake_build -%install -export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}${LD_LIBRARY_PATH:+:}%{_libdir}" -# its qmake. of course it is broken -make INSTALL_ROOT=%{buildroot}/%{_prefix} install +make docs -# Source Code Pro is packaged independently -rm -r %{buildroot}%{_datadir}/qtcreator/fonts +%install +%cmake_install -mkdir -p %{buildroot}%{_datadir}/doc/packages/qt5 -cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_datadir}/doc/packages/qt5/ +%if 0%{?build_clang_backend} +if [ ! -f %{buildroot}%{_libdir}/qtcreator/libexec/clangbackend ]; then + echo 'ERROR: The Clang backend was not built. Check the build requirements' ; exit 1 +fi +%endif -mkdir -p %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator -cp -a doc/qtcreator/* %{buildroot}%{_datadir}/doc/packages/qt5/qtcreator/ +# Install the doc files +mkdir -p %{buildroot}%{_docdir}/qt5 +pushd build +cp share/doc/qtcreator/qtcreator.qch %{buildroot}%{_docdir}/qt5/ +popd + +mkdir -p %{buildroot}%{_docdir}/qt5/qtcreator +cp -a doc/qtcreator/* %{buildroot}%{_docdir}/qt5/qtcreator/ + +# Install icons for the desktop file +# https://bugreports.qt.io/browse/QTCREATORBUG-24355 +for i in 16 24 32 48 64 128 256 512; do + mkdir -p %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps + install -D -m644 src/plugins/coreplugin/images/logo/${i}/QtProject-qtcreator.png %{buildroot}%{_datadir}/icons/hicolor/${i}x${i}/apps/QtProject-qtcreator.png +done -%suse_update_desktop_file -i org.qt-project.qtcreator Development Qt IDE +# Source Code Pro is packaged independently +rm -r %{buildroot}%{_datadir}/qtcreator/fonts # plugin development files mkdir %{buildroot}%{_datadir}/qtcreator-devel @@ -157,24 +193,20 @@ EOF %post -p /sbin/ldconfig - %postun -p /sbin/ldconfig %files %license *GPL* +%dir %{_docdir}/qt5 %{_bindir}/qtcreator -%{_libdir}/qtcreator/ -%if %{build_clang_backend} -%{_libdir}/qtcreator/libexec/clangbackend -%endif -%{_datadir}/qtcreator/ -%{_datadir}/icons/hicolor +%{_bindir}/qtcreator.sh %{_datadir}/applications/org.qt-project.qtcreator.desktop -%dir %{_datadir}/metainfo +%{_datadir}/icons/hicolor %{_datadir}/metainfo/org.qt-project.qtcreator.appdata.xml -%dir %{_datadir}/doc/packages/qt5 -%{_datadir}/doc/packages/qt5/qtcreator/ -%{_datadir}/doc/packages/qt5/qtcreator.qch +%{_datadir}/qtcreator/ +%{_docdir}/qt5/qtcreator.qch +%{_docdir}/qt5/qtcreator/ +%{_libdir}/qtcreator/ %files plugin-devel %license *GPL* ++++++ 0001-Disable-some-plugins.patch ++++++ >From 9c60785e8aa4d38174a5bbdb071d40658b4b6027 Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> Date: Wed, 15 Jul 2020 10:09:31 +0200 Subject: [PATCH] Disable some plugins - The updateinfo plugin only works when using the installer - The clangformat plugin requires a clang patch which was never accepted upstream [1] - The qlitehtml plugin causes installation issues. The documentation can already be browsed using either QtWebEngine or QTextBrowser. [1] https://reviews.llvm.org/D53072 --- src/plugins/CMakeLists.txt | 2 -- src/plugins/help/CMakeLists.txt | 9 --------- 2 files changed, 11 deletions(-) diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt index 70f8f420..300b1bc9 100644 --- a/src/plugins/CMakeLists.txt +++ b/src/plugins/CMakeLists.txt @@ -7,7 +7,6 @@ add_subdirectory(serialterminal) add_subdirectory(helloworld) add_subdirectory(imageviewer) add_subdirectory(marketplace) -add_subdirectory(updateinfo) add_subdirectory(welcome) # Level 2: (only depends on Level 1 and below) @@ -41,7 +40,6 @@ add_subdirectory(vcsbase) # Level 5: add_subdirectory(bazaar) add_subdirectory(beautifier) -add_subdirectory(clangformat) add_subdirectory(clangrefactoring) add_subdirectory(clearcase) add_subdirectory(cmakeprojectmanager) diff --git a/src/plugins/help/CMakeLists.txt b/src/plugins/help/CMakeLists.txt index 4d5fd232..64f8bd4e 100644 --- a/src/plugins/help/CMakeLists.txt +++ b/src/plugins/help/CMakeLists.txt @@ -52,15 +52,6 @@ extend_qtc_plugin(Help webenginehelpviewer.h ) -if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/qlitehtml/litehtml/CMakeLists.txt) - add_subdirectory(qlitehtml) -else() - find_package(litehtml QUIET) - if (TARGET litehtml) - add_subdirectory(qlitehtml) - endif() -endif() - extend_qtc_plugin(Help CONDITION TARGET litehtml AND TARGET qlitehtml FEATURE_INFO "litehtml help viewer" -- 2.27.0 ++++++ 0001-Fix-build-with-openSUSE-clang9-package.patch ++++++ --- /var/tmp/diff_new_pack.LmuY1r/_old 2020-08-28 21:21:19.332323066 +0200 +++ /var/tmp/diff_new_pack.LmuY1r/_new 2020-08-28 21:21:19.336323068 +0200 @@ -1,104 +1,91 @@ -From 483bd167b14c708d4d2be882fe99660b67b0b0cb Mon Sep 17 00:00:00 2001 +From a87460582c3843acffb307217e5c3fa7061cdb2f Mon Sep 17 00:00:00 2001 From: Christophe Giboudeaux <christo...@krop.fr> -Date: Wed, 4 Dec 2019 16:22:53 +0100 +Date: Tue, 14 Jul 2020 14:37:22 +0200 Subject: [PATCH] Fix build with openSUSE clang9 package. qt-creator doesn't support linking to clang-cpp instead of split libraries. See https://bugreports.qt.io/browse/QTCREATORBUG-23172 --- - qbs/modules/libclang/functions.js | 37 ++----------------- - src/shared/clang/clang_installation.pri | 11 ++---- - .../clangpchmanagerbackend/CMakeLists.txt | 2 +- - .../source/CMakeLists.txt | 5 +-- - tests/unit/unittest/CMakeLists.txt | 12 ++---- - 5 files changed, 12 insertions(+), 55 deletions(-) + CMakeLists.txt | 4 ++-- + src/plugins/clangcodemodel/CMakeLists.txt | 2 +- + src/plugins/clangformat/CMakeLists.txt | 4 ++-- + src/plugins/clangpchmanager/CMakeLists.txt | 2 +- + src/plugins/clangrefactoring/CMakeLists.txt | 2 +- + src/tools/clangpchmanagerbackend/CMakeLists.txt | 2 +- + src/tools/clangrefactoringbackend/source/CMakeLists.txt | 5 +---- + tests/unit/unittest/CMakeLists.txt | 8 ++++---- + 8 files changed, 13 insertions(+), 16 deletions(-) -diff --git a/qbs/modules/libclang/functions.js b/qbs/modules/libclang/functions.js -index 0c15a2a6..114e45b9 100644 ---- a/qbs/modules/libclang/functions.js -+++ b/qbs/modules/libclang/functions.js -@@ -113,24 +113,9 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) - return []; - var libs = [] - if (qtcFunctions.versionIsAtLeast(clangVersion, MinimumLLVMVersion)) { -- if (qtcFunctions.versionIsAtLeast(clangVersion, "8.0.0")) { -- libs.push( -- "clangFormat", -- "clangToolingInclusions", -- "clangToolingCore", -- "clangRewrite", -- "clangLex", -- "clangBasic" -- ); -- } else { -- libs.push( -- "clangFormat", -- "clangToolingCore", -- "clangRewrite", -- "clangLex", -- "clangBasic" -- ); -- } -+ libs.push( -+ "clang-cpp" -+ ); - libs = libs.concat(extraLibraries(llvmConfig, targetOS)); - } - -@@ -140,21 +125,7 @@ function formattingLibs(llvmConfig, qtcFunctions, targetOS) - function toolingLibs(llvmConfig, targetOS) - { - var fixedList = [ -- "clangTooling", -- "clangFrontend", -- "clangIndex", -- "clangParse", -- "clangSerialization", -- "clangSema", -- "clangEdit", -- "clangAnalysis", -- "clangDriver", -- "clangDynamicASTMatchers", -- "clangASTMatchers", -- "clangToolingCore", -- "clangAST", -- "clangLex", -- "clangBasic", -+ "clang-cpp", - ]; - - return fixedList.concat(extraLibraries(llvmConfig, targetOS)); -diff --git a/src/shared/clang/clang_installation.pri b/src/shared/clang/clang_installation.pri -index 08838838..a7dd01c7 100644 ---- a/src/shared/clang/clang_installation.pri -+++ b/src/shared/clang/clang_installation.pri -@@ -131,9 +131,7 @@ defineReplace(extractWarnings) { - return($$result) - } +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f76ce0a1..effeb731 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -74,11 +74,11 @@ else() + endif() + install(TARGETS OptionalSvg EXPORT QtCreator) --CLANGTOOLING_LIBS=-lclangTooling -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ -- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- -lclangASTMatchers -lclangToolingCore -lclangAST -lclangLex -lclangBasic -+CLANGTOOLING_LIBS=-lclang-cpp - win32:CLANGTOOLING_LIBS += -lversion +-find_package(Clang COMPONENTS libclang QUIET) ++find_package(Clang COMPONENTS clang-cpp QUIET) + # silence a lot of warnings from building against llvm + # this would better fit inside a central libclang detection/include cmake file, but since we do not + # have one put it temporary here +-if(MSVC AND TARGET libclang) ++if(MSVC AND TARGET clang-cpp) + target_compile_options(libclang INTERFACE /wd4100 /wd4141 /wd4146 /wd4244 /wd4267 /wd4291) + endif() + find_package(LLVM QUIET) +diff --git a/src/plugins/clangcodemodel/CMakeLists.txt b/src/plugins/clangcodemodel/CMakeLists.txt +index 56ee6841..05b142bd 100644 +--- a/src/plugins/clangcodemodel/CMakeLists.txt ++++ b/src/plugins/clangcodemodel/CMakeLists.txt +@@ -3,7 +3,7 @@ if (WITH_TESTS) + endif() - BIN_EXTENSION = -@@ -207,11 +205,8 @@ isEmpty(LLVM_VERSION) { - isEmpty(QTC_CLANG_BUILDMODE_MISMATCH)|!equals(QTC_CLANG_BUILDMODE_MISMATCH, 1) { - CLANGFORMAT_MAIN_HEADER = $$LLVM_INCLUDEPATH/clang/Format/Format.h - exists($$CLANGFORMAT_MAIN_HEADER) { -- CLANGFORMAT_LIBS=-lclangFormat -lclangToolingInclusions -lclangToolingCore -lclangRewrite -lclangLex -lclangBasic -- ALL_CLANG_LIBS=-lclangFormat -lclangToolingInclusions -lclangTooling -lclangToolingCore \ -- -lclangRewrite -lclangIndex -lclangFrontend -lclangParse -lclangSerialization \ -- -lclangSema -lclangEdit -lclangAnalysis -lclangDriver -lclangDynamicASTMatchers \ -- -lclangASTMatchers -lclangAST -lclangLex -lclangBasic -+ CLANGFORMAT_LIBS=-lclang-cpp -+ ALL_CLANG_LIBS=-lclang-cpp - win32:CLANGFORMAT_LIBS += -lversion - } - } + add_qtc_plugin(ClangCodeModel +- CONDITION TARGET libclang ++ CONDITION TARGET clang-cpp + DEPENDS ClangSupport CPlusPlus + PLUGIN_DEPENDS Core CppTools TextEditor ${TST_COMPONENT} + SOURCES +diff --git a/src/plugins/clangformat/CMakeLists.txt b/src/plugins/clangformat/CMakeLists.txt +index 3edaead7..610a8766 100644 +--- a/src/plugins/clangformat/CMakeLists.txt ++++ b/src/plugins/clangformat/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_qtc_plugin(ClangFormat +- CONDITION TARGET libclang +- DEPENDS Utils Qt5::Widgets clangFormat ++ CONDITION TARGET clang-cpp ++ DEPENDS Utils Qt5::Widgets clang-cpp LLVM + INCLUDES "${CLANG_INCLUDE_DIRS}" + PLUGIN_DEPENDS Core TextEditor CppEditor CppTools ProjectExplorer + SOURCES +diff --git a/src/plugins/clangpchmanager/CMakeLists.txt b/src/plugins/clangpchmanager/CMakeLists.txt +index c1c9b29f..86403c41 100644 +--- a/src/plugins/clangpchmanager/CMakeLists.txt ++++ b/src/plugins/clangpchmanager/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_qtc_plugin(ClangPchManager + BUILD_DEFAULT OFF +- CONDITION TARGET libclang ++ CONDITION TARGET clang-cpp + DEPENDS ClangSupport CPlusPlus + DEFINES CLANGPCHMANAGER_LIB + PLUGIN_DEPENDS Core CppTools +diff --git a/src/plugins/clangrefactoring/CMakeLists.txt b/src/plugins/clangrefactoring/CMakeLists.txt +index 95c926dc..621163c8 100644 +--- a/src/plugins/clangrefactoring/CMakeLists.txt ++++ b/src/plugins/clangrefactoring/CMakeLists.txt +@@ -1,6 +1,6 @@ + add_qtc_plugin(ClangRefactoring + BUILD_DEFAULT OFF +- CONDITION TARGET libclang ++ CONDITION TARGET clang-cpp + DEPENDS ClangSupport CPlusPlus + PLUGIN_DEPENDS Core CppTools TextEditor ClangPchManager + SOURCES ${TEST_SOURCES} diff --git a/src/tools/clangpchmanagerbackend/CMakeLists.txt b/src/tools/clangpchmanagerbackend/CMakeLists.txt -index 965ef441..0137a102 100644 +index 965ef441..b49967bf 100644 --- a/src/tools/clangpchmanagerbackend/CMakeLists.txt +++ b/src/tools/clangpchmanagerbackend/CMakeLists.txt @@ -3,7 +3,7 @@ add_subdirectory(source) @@ -106,58 +93,60 @@ DEPENDS clangrefactoringbackend_lib clangpchmanagerbackend_lib - clangTooling libclang Sqlite ClangSupport clangQuery clangIndex -+ clang-cpp libclang Sqlite ++ clang-cpp Sqlite SOURCES clangpchmanagerbackendmain.cpp ) diff --git a/src/tools/clangrefactoringbackend/source/CMakeLists.txt b/src/tools/clangrefactoringbackend/source/CMakeLists.txt -index f06ddee1..77c9a6da 100644 +index f06ddee1..66c3e431 100644 --- a/src/tools/clangrefactoringbackend/source/CMakeLists.txt +++ b/src/tools/clangrefactoringbackend/source/CMakeLists.txt -@@ -2,10 +2,7 @@ add_qtc_library(clangrefactoringbackend_lib STATIC +@@ -1,10 +1,7 @@ + add_qtc_library(clangrefactoringbackend_lib STATIC PUBLIC_DEPENDS Threads::Threads - LLVMCore libclang +- LLVMCore libclang - clangAST clangASTMatchers clangBasic clangDynamicASTMatchers clangFrontend - clangHandleCXX clangIndex clangLex - clangSerialization clangTooling clangQuery -- ClangSupport -+ clang-cpp ++ LLVM clang-cpp + ClangSupport PUBLIC_DEFINES CLANGSUPPORT_BUILD_LIB PUBLIC_INCLUDES - ${CLANG_INCLUDE_DIRS} diff --git a/tests/unit/unittest/CMakeLists.txt b/tests/unit/unittest/CMakeLists.txt -index 4e7b97d5..ad6a8719 100644 +index 9ae0b9c9..69dc3440 100644 --- a/tests/unit/unittest/CMakeLists.txt +++ b/tests/unit/unittest/CMakeLists.txt -@@ -248,7 +248,7 @@ if (TARGET libclang) - target_link_libraries(unittest PRIVATE libclang) - endif() +@@ -202,7 +202,7 @@ string(REPLACE "$$dependencyList" "\"Dependencies\" : []" plugin_json_in ${plugi + file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/CppTools.json" ${plugin_json_in}}) --if (TARGET clangTooling) -+if (TARGET clang-cpp) - target_compile_definitions(unittest PRIVATE CLANG_UNIT_TESTS) - target_sources(unittest PRIVATE + extend_qtc_test(unittest +- CONDITION TARGET libclang ++ CONDITION TARGET clang-cpp + INCLUDES "${CLANG_INCLUDE_DIRS}" + DEPENDS libclang + SOURCES +@@ -260,9 +260,9 @@ extend_qtc_test(unittest + ) + + extend_qtc_test(unittest +- CONDITION TARGET clangTooling ++ CONDITION TARGET clang-cpp + DEFINES CLANG_UNIT_TESTS +- DEPENDS clangTooling clangIndex clangQuery ++ DEPENDS clang-cpp LLVM + SOURCES gtest-llvm-printing.cpp -@@ -270,16 +270,10 @@ if (TARGET clangTooling) - builddependencycollector-test.cpp - mockrefactoringclient.h - mockrefactoringserver.h -- ) -- target_link_libraries(unittest -- PRIVATE clangTooling clangIndex clangQuery) --endif() -- --if (TARGET clangFormat) -- target_sources(unittest PRIVATE - clangformat-test.cpp - ) -- target_link_libraries(unittest PRIVATE clangFormat) -+ target_link_libraries(unittest -+ PRIVATE clang-cpp) - endif() + clangquerygatherer-test.cpp +@@ -286,7 +286,7 @@ extend_qtc_test(unittest + ) - if (TARGET GoogleBenchmark) + extend_qtc_test(unittest +- CONDITION TARGET clangFormat ++ CONDITION TARGET clang-cpp + DEPENDS clangFormat + SOURCES + clangformat-test.cpp -- -2.26.2 +2.27.0 ++++++ qt-creator-opensource-src-4.12.2.tar.xz -> qt-creator-opensource-src-4.13.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/libqt5-creator/qt-creator-opensource-src-4.12.2.tar.xz /work/SRC/openSUSE:Factory/.libqt5-creator.new.3399/qt-creator-opensource-src-4.13.0.tar.xz differ: char 26, line 1
