Merge remote-tracking branch 'origin/8.0'

Conflicts: cmake/QtCreatorIDEBranding.cmake qbs/modules/qtc/qtc.qbs qtcreator_ide_branding.pri src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp Change-Id: I1ed3dd86fe5b4b87e3015c41652f5d0fa16d7070
2022-07-25 09:25:00 +02:00
parent 165fefffe8 0acb7179c5
commit 9328aaa835
60 changed files with 2211 additions and 1309 deletions
--- a/src/plugins/clangcodemodel/test/data/completion/completion.pro
+++ b/src/plugins/clangcodemodel/test/data/completion/completion.pro
@@ -27,7 +27,7 @@ SOURCES = \
    privateFuncDefCompletion.cpp \
    signalCompletion.cpp

-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken

 HEADERS = mainwindow.h
 FORMS = mainwindow.ui
--- a/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro
+++ b/src/plugins/clangcodemodel/test/data/find-usages/find-usages.pro
@@ -2,4 +2,4 @@ TEMPLATE = app
 QT = core
 HEADERS = defs.h
 SOURCES = main.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
--- a/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro
+++ b/src/plugins/clangcodemodel/test/data/follow-symbol/follow-symbol.pro
@@ -2,4 +2,4 @@ TEMPLATE = app
 CONFIG -= qt
 HEADERS = cursor.h header.h
 SOURCES = cursor.cpp main.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
--- a/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro
+++ b/src/plugins/clangcodemodel/test/data/highlighting/highlighting.pro
@@ -1,4 +1,4 @@
 TEMPLATE = app
 CONFIG -= qt
 SOURCES = highlighting.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken
--- a/src/plugins/clangcodemodel/test/data/local-references/local-references.pro
+++ b/src/plugins/clangcodemodel/test/data/local-references/local-references.pro
@@ -1,4 +1,4 @@
 TEMPLATE = app
 CONFIG -= qt
 SOURCES = references.cpp
-QMAKE_CXXFLAGS += -ffoo
+QMAKE_CXXFLAGS += -broken