diff options
Diffstat (limited to 'examples/widgets/richtext/syntaxhighlighter')
-rw-r--r-- | examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt | 34 | ||||
-rw-r--r-- | examples/widgets/richtext/syntaxhighlighter/highlighter.cpp | 2 |
2 files changed, 20 insertions, 16 deletions
diff --git a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt index 4ec2cc8ee3..13fd37ba1b 100644 --- a/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt +++ b/examples/widgets/richtext/syntaxhighlighter/CMakeLists.txt @@ -1,16 +1,13 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + cmake_minimum_required(VERSION 3.16) project(syntaxhighlighter LANGUAGES CXX) -set(CMAKE_AUTOMOC ON) - -if(NOT DEFINED INSTALL_EXAMPLESDIR) - set(INSTALL_EXAMPLESDIR "examples") -endif() - -set(INSTALL_EXAMPLEDIR "${INSTALL_EXAMPLESDIR}/widgets/richtext/syntaxhighlighter") - find_package(Qt6 REQUIRED COMPONENTS Core Gui Widgets) +qt_standard_project_setup() + qt_add_executable(syntaxhighlighter highlighter.cpp highlighter.h main.cpp @@ -22,14 +19,21 @@ set_target_properties(syntaxhighlighter PROPERTIES MACOSX_BUNDLE TRUE ) -target_link_libraries(syntaxhighlighter PUBLIC - Qt::Core - Qt::Gui - Qt::Widgets +target_link_libraries(syntaxhighlighter PRIVATE + Qt6::Core + Qt6::Gui + Qt6::Widgets ) install(TARGETS syntaxhighlighter - RUNTIME DESTINATION "${INSTALL_EXAMPLEDIR}" - BUNDLE DESTINATION "${INSTALL_EXAMPLEDIR}" - LIBRARY DESTINATION "${INSTALL_EXAMPLEDIR}" + BUNDLE DESTINATION . + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} +) + +qt_generate_deploy_app_script( + TARGET syntaxhighlighter + OUTPUT_SCRIPT deploy_script + NO_UNSUPPORTED_PLATFORM_ERROR ) +install(SCRIPT ${deploy_script}) diff --git a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp index 11e203c333..d78de20a7d 100644 --- a/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp +++ b/examples/widgets/richtext/syntaxhighlighter/highlighter.cpp @@ -72,7 +72,7 @@ Highlighter::Highlighter(QTextDocument *parent) //! [7] void Highlighter::highlightBlock(const QString &text) { - for (const HighlightingRule &rule : qAsConst(highlightingRules)) { + for (const HighlightingRule &rule : std::as_const(highlightingRules)) { QRegularExpressionMatchIterator matchIterator = rule.pattern.globalMatch(text); while (matchIterator.hasNext()) { QRegularExpressionMatch match = matchIterator.next(); |