Merge remote-tracking branch 'origin/4.15' into 5.0

Conflicts:
	src/plugins/cmakeprojectmanager/projecttreehelper.cpp
	src/plugins/coreplugin/mainwindow.cpp

Change-Id: Ie3a281b8635e79ca5fa794a127ed0039f33fe2ee

cmake/QtCreatorAPI.cmake

@@ -110,7 +110,7 @@ function(qtc_source_dir varName)
 endfunction()
 
 function(add_qtc_library name)
-  cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;UNVERSIONED;FEATURE_INFO"
+  cmake_parse_arguments(_arg "STATIC;OBJECT;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;UNVERSIONED;FEATURE_INFO;SKIP_PCH"
     "DESTINATION;COMPONENT;SOURCES_PREFIX;BUILD_DEFAULT"
     "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN}
   )
@@ -256,7 +256,10 @@ function(add_qtc_library name)
     ARCHIVE_OUTPUT_DIRECTORY "${_output_binary_dir}/${IDE_LIBRARY_ARCHIVE_PATH}"
     ${_arg_PROPERTIES}
   )
-  enable_pch(${name})
+
+  if (NOT _arg_SKIP_PCH)
+    enable_pch(${name})
+  endif()
 
   if (WIN32 AND library_type STREQUAL "SHARED" AND NOT _arg_UNVERSIONED)
     # Match qmake naming scheme e.g. Library4.dll
@@ -313,7 +316,7 @@ endfunction(add_qtc_library)
 
 function(add_qtc_plugin target_name)
   cmake_parse_arguments(_arg
-    "SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT"
+    "SKIP_DEBUG_CMAKE_FILE_CHECK;SKIP_INSTALL;INTERNAL_ONLY;SKIP_TRANSLATION;EXPORT;SKIP_PCH"
     "VERSION;COMPAT_VERSION;PLUGIN_JSON_IN;PLUGIN_PATH;PLUGIN_NAME;OUTPUT_NAME;BUILD_DEFAULT"
     "CONDITION;DEPENDS;PUBLIC_DEPENDS;DEFINES;PUBLIC_DEFINES;INCLUDES;PUBLIC_INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PLUGIN_DEPENDS;PLUGIN_RECOMMENDS;PLUGIN_TEST_DEPENDS;PROPERTIES"
     ${ARGN}
@@ -522,7 +525,9 @@ function(add_qtc_plugin target_name)
       IMPORT_PREFIX ""
     )
   endif()
-  enable_pch(${target_name})
+  if (NOT _arg_SKIP_PCH)
+    enable_pch(${target_name})
+  endif()
 
   if (NOT _arg_SKIP_INSTALL)
     if (_arg_EXPORT)
@@ -597,7 +602,7 @@ function(extend_qtc_test target_name)
 endfunction()
 
 function(add_qtc_executable name)
-  cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS"
+  cmake_parse_arguments(_arg "SKIP_INSTALL;SKIP_TRANSLATION;ALLOW_ASCII_CASTS;SKIP_PCH"
     "DESTINATION;COMPONENT;BUILD_DEFAULT"
     "CONDITION;DEPENDS;DEFINES;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;EXTRA_TRANSLATIONS;PROPERTIES" ${ARGN})
 
@@ -698,7 +703,9 @@ function(add_qtc_executable name)
     VISIBILITY_INLINES_HIDDEN ON
     ${_arg_PROPERTIES}
   )
-  enable_pch(${name})
+  if (NOT _arg_SKIP_PCH)
+    enable_pch(${name})
+  endif()
 
   if (NOT _arg_SKIP_INSTALL)
     unset(COMPONENT_OPTION)
@@ -785,7 +792,7 @@ function(extend_qtc_executable name)
 endfunction()
 
 function(add_qtc_test name)
-  cmake_parse_arguments(_arg "GTEST" "TIMEOUT" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC" ${ARGN})
+  cmake_parse_arguments(_arg "GTEST" "TIMEOUT" "DEFINES;DEPENDS;INCLUDES;SOURCES;EXPLICIT_MOC;SKIP_AUTOMOC;SKIP_PCH" ${ARGN})
 
   if ($_arg_UNPARSED_ARGUMENTS)
     message(FATAL_ERROR "add_qtc_test had unparsed arguments!")
@@ -837,7 +844,9 @@ function(add_qtc_test name)
     BUILD_RPATH "${_RPATH_BASE}/${_RPATH}"
     INSTALL_RPATH "${_RPATH_BASE}/${_RPATH}"
   )
-  enable_pch(${name})
+  if (NOT _arg_SKIP_PCH)
+    enable_pch(${name})
+  endif()
 
   if (NOT _arg_GTEST)
     add_test(NAME ${name} COMMAND ${name})

cmake/QtCreatorAPIInternal.cmake

@@ -125,6 +125,17 @@ function(qtc_handle_sccache_support)
   endif()
 endfunction()
 
+function(qtc_enable_release_for_debug_configuration)
+  if (MSVC)
+    string(REPLACE "/Od" "/O2" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    string(REPLACE "/Ob0" "/Ob1" CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+    string(REPLACE "/RTC1" ""  CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}")
+  else()
+    set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -O2")
+  endif()
+  set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG}" PARENT_SCOPE)
+endfunction()
+
 function(append_extra_translations target_name)
   if(NOT ARGN)
     return()

doc/qtcreator/src/debugger/creator-only/creator-debugger.qdoc

@@ -1510,7 +1510,7 @@
             contents of the pane to debugger-related questions to the \QC
             mailing list (qt-creator@qt-project.org) or paste them to a
             \l{Pasting and Fetching Code Snippets}{code pasting service} before
-            asking questions in the IRC (on the #qt-creator channel at FreeNode).
+            asking questions in the IRC (on the #qt-creator channel at Libera.Chat).
 
     \endlist
 

src/libs/3rdparty/cplusplus/CMakeLists.txt

@@ -41,5 +41,14 @@ add_qtc_library(3rd_cplusplus OBJECT
     Type.cpp Type.h
     TypeVisitor.cpp TypeVisitor.h
     cppassert.h
+  SKIP_PCH
   PROPERTIES POSITION_INDEPENDENT_CODE ON
 )
+
+if(TARGET 3rd_cplusplus)
+  qtc_enable_release_for_debug_configuration()
+  if (BUILD_WITH_PCH)
+    target_precompile_headers(3rd_cplusplus PRIVATE
+      "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h")
+  endif()
+endif()

src/libs/cplusplus/CMakeLists.txt

@@ -40,4 +40,13 @@ add_qtc_library(CPlusPlus
     pp-engine.h pp-scanner.cpp
     pp-scanner.h
     pp.h
+  SKIP_PCH
 )
+
+if(TARGET CPlusPlus)
+  qtc_enable_release_for_debug_configuration()
+  if (BUILD_WITH_PCH)
+    target_precompile_headers(CPlusPlus PRIVATE
+      "${QtCreator_SOURCE_DIR}/src/shared/qtcreator_gui_pch.h")
+  endif()
+endif()

src/plugins/coreplugin/mainwindow.cpp

@@ -1254,7 +1254,7 @@ void MainWindow::contact()
     QMessageBox dlg(QMessageBox::Information, tr("Contact"),
            tr("<p>Qt Creator developers can be reached at the Qt Creator mailing list:</p>"
               "%1"
-              "<p>or the #qt-creator channel on FreeNode IRC:</p>"
+              "<p>or the #qt-creator channel on Libera.Chat IRC:</p>"
               "%2"
               "<p>Our bug tracker is located at %3.</p>"
               "<p>Please use %4 for bigger chunks of text.</p>")
@@ -1263,8 +1263,8 @@ void MainWindow::contact()
                             "mailto:qt-creator@qt-project.org"
                          "</a></p>")
                     .arg("<p>&nbsp;&nbsp;&nbsp;&nbsp;"
-                            "<a href=\"https://irc.libera.chat\">"
+                            "<a href=\"https://web.libera.chat/#qt-creator\">"
-                            "irc://irc.libera.chat/qt-creator"
+                            "https://web.libera.chat/#qt-creator"
                          "</a></p>")
                     .arg("<a href=\"https://bugreports.qt.io/projects/QTCREATORBUG\">"
                             "https://bugreports.qt.io"

src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp

@@ -332,8 +332,9 @@ void ItemLibraryWidget::handleAddImport(int index)
                                                + import.toImportString());
     }
 
-    m_model->changeImports({import}, {});
+    auto document = QmlDesignerPlugin::instance()->currentDesignDocument();
-    QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManagerImport(import);
+    document->documentModel()->changeImports({import}, {});
+    document->updateSubcomponentManagerImport(import);
 
     m_stackedWidget->setCurrentIndex(0); // switch to the Components view after import is added
     updateSearch();

src/plugins/resourceeditor/resourceeditorplugin.cpp

@@ -258,6 +258,7 @@ void ResourceEditorPlugin::extensionsInitialized()
             QTC_ASSERT(pn, continue);
             const Utils::FilePath path = file->filePath();
             auto topLevel = std::make_unique<ResourceTopLevelNode>(path, pn->filePath());
+            topLevel->setEnabled(file->isEnabled());
             topLevel->setIsGenerated(file->isGenerated());
             pn->replaceSubtree(file, std::move(topLevel));
         }