diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/libs/3rdparty/cplusplus/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/libs/cplusplus/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | src/plugins/coreplugin/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp | 5 | ||||
| -rw-r--r-- | src/plugins/resourceeditor/resourceeditorplugin.cpp | 1 | ||||
| m--------- | src/shared/qbs | 0 |
6 files changed, 25 insertions, 5 deletions
diff --git a/src/libs/3rdparty/cplusplus/CMakeLists.txt b/src/libs/3rdparty/cplusplus/CMakeLists.txt index b8a8607a8c..f2515c9c3a 100644 --- a/src/libs/3rdparty/cplusplus/CMakeLists.txt +++ b/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() diff --git a/src/libs/cplusplus/CMakeLists.txt b/src/libs/cplusplus/CMakeLists.txt index 9ca49291d4..aa650c11b3 100644 --- a/src/libs/cplusplus/CMakeLists.txt +++ b/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() diff --git a/src/plugins/coreplugin/mainwindow.cpp b/src/plugins/coreplugin/mainwindow.cpp index af289bfd07..6bcb343ca5 100644 --- a/src/plugins/coreplugin/mainwindow.cpp +++ b/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> " - "<a href=\"https://irc.libera.chat\">" - "irc://irc.libera.chat/qt-creator" + "<a href=\"https://web.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" diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index a0cc6b3ba8..a4ba21335e 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -332,8 +332,9 @@ void ItemLibraryWidget::handleAddImport(int index) + import.toImportString()); } - m_model->changeImports({import}, {}); - QmlDesignerPlugin::instance()->currentDesignDocument()->updateSubcomponentManagerImport(import); + auto document = QmlDesignerPlugin::instance()->currentDesignDocument(); + document->documentModel()->changeImports({import}, {}); + document->updateSubcomponentManagerImport(import); m_stackedWidget->setCurrentIndex(0); // switch to the Components view after import is added updateSearch(); diff --git a/src/plugins/resourceeditor/resourceeditorplugin.cpp b/src/plugins/resourceeditor/resourceeditorplugin.cpp index 50708c98c1..25c29e2cdc 100644 --- a/src/plugins/resourceeditor/resourceeditorplugin.cpp +++ b/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)); } diff --git a/src/shared/qbs b/src/shared/qbs -Subproject f002b866e7e190ddcadfb61ca935c6f0b6ef7e1 +Subproject bd2d37ae336e3c88e2fd484cc64eb05b46d0788 |