From ddbf884c127943300177e16433101d380dccac1d Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Mon, 22 Jul 2024 09:26:45 +0200 Subject: [PATCH] QmlDesigner: Fix warnings about deprecated operator+ Use operator| instead. Change-Id: I34392de11a9430922a644851602d5cce4c72df42 Reviewed-by: hjk Reviewed-by: Tim Jenssen --- .../components/itemlibrary/itemlibrarywidget.cpp | 2 +- .../components/timelineeditor/timelinetoolbar.cpp | 11 +++++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp index ffefc431782..dd43d8bf2b1 100644 --- a/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp +++ b/src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp @@ -153,7 +153,7 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache) setStyleSheet(Theme::replaceCssColors( QString::fromUtf8(::Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")))); - m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL + Qt::Key_F5), this); + m_qmlSourceUpdateShortcut = new QShortcut(QKeySequence(Qt::CTRL | Qt::Key_F5), this); connect(m_qmlSourceUpdateShortcut, &QShortcut::activated, this, &ItemLibraryWidget::reloadQmlSource); connect(&m_compressionTimer, &QTimer::timeout, this, &ItemLibraryWidget::updateModel); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index 7c0e69d9ce7..e204c0ad4a0 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -324,12 +324,11 @@ void TimelineToolBar::createCenterControls() addSpacing(10); - auto *loopAnimation = createAction( - TimelineConstants::C_LOOP_PLAYBACK, - Theme::iconFromName(Theme::Icon::loopPlayback_medium), - tr("Loop Playback"), - QKeySequence((Qt::ControlModifier | Qt::ShiftModifier) - + Qt::Key_Space)); // TODO: Toggles looping. Select shortcut for this QDS-4941 + // TODO: Toggles looping. Select shortcut for this QDS-4941 + auto *loopAnimation = createAction(TimelineConstants::C_LOOP_PLAYBACK, + Theme::iconFromName(Theme::Icon::loopPlayback_medium), + tr("Loop Playback"), + Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Space); loopAnimation->setCheckable(true); connect(loopAnimation, &QAction::toggled, [&](bool value) { emit loopPlaybackToggled(value);} );