feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix warnings about deprecated operator+

Browse Source 
Use operator| instead.

Change-Id: I34392de11a9430922a644851602d5cce4c72df42
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Jarek Kobus
2024-07-22 09:26:45 +02:00
parent 841db70d32
commit ddbf884c12
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qmldesigner/components/itemlibrary/itemlibrarywidget.cpp
View File

@@ -153,7 +153,7 @@ ItemLibraryWidget::ItemLibraryWidget(AsynchronousImageCache &imageCache)
setStyleSheet(Theme::replaceCssColors( setStyleSheet(Theme::replaceCssColors(
QString::fromUtf8(::Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css")))); 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_qmlSourceUpdateShortcut, &QShortcut::activated, this, &ItemLibraryWidget::reloadQmlSource);
connect(&m_compressionTimer, &QTimer::timeout, this, &ItemLibraryWidget::updateModel); connect(&m_compressionTimer, &QTimer::timeout, this, &ItemLibraryWidget::updateModel);

11
src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
View File

@@ -324,12 +324,11 @@ void TimelineToolBar::createCenterControls()
addSpacing(10); addSpacing(10);
auto *loopAnimation = createAction( // TODO: Toggles looping. Select shortcut for this QDS-4941
TimelineConstants::C_LOOP_PLAYBACK, auto *loopAnimation = createAction(TimelineConstants::C_LOOP_PLAYBACK,
Theme::iconFromName(Theme::Icon::loopPlayback_medium), Theme::iconFromName(Theme::Icon::loopPlayback_medium),
tr("Loop Playback"), tr("Loop Playback"),
QKeySequence((Qt::ControlModifier | Qt::ShiftModifier) Qt::ControlModifier | Qt::ShiftModifier | Qt::Key_Space);
+ Qt::Key_Space)); // TODO: Toggles looping. Select shortcut for this QDS-4941
loopAnimation->setCheckable(true); loopAnimation->setCheckable(true);
connect(loopAnimation, &QAction::toggled, [&](bool value) { emit loopPlaybackToggled(value);} ); connect(loopAnimation, &QAction::toggled, [&](bool value) { emit loopPlaybackToggled(value);} );