diff options
| author | Igor Bugaev <freedbrt@gmail.com> | 2021-06-25 10:12:20 +0300 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-06-29 11:15:17 +0000 |
| commit | 760eb2acaefd3ca223eb0aa202238f7a0080b53c (patch) | |
| tree | 2996ce9a30fd4a2f0fcf67c1b365337c226a24e8 | |
| parent | 532b3c3ab86b7ffea5da71a9048b95ab43862e05 (diff) | |
Fix compilation for msvc2019
The Visual Studio 2019 (16.8), marks construction
function(var */*name*/) as warning, but compiler flag /WX marks
warnings as errors, and because of this, it's not possible to compile
this module. This issue fixed in Visual Studio 16.9
Change-Id: If79d1b73d916472e2e82d15ebf423eac646fc76d
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
(cherry picked from commit 184a5cc25f7c4a30c82a61848a0e62d9044041f5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
4 files changed, 5 insertions, 5 deletions
diff --git a/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp b/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp index c893d93ed6..64e77e61c5 100644 --- a/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp +++ b/src/quickcontrols2/windows/qtquickcontrols2windowsstyleplugin.cpp @@ -65,7 +65,7 @@ QString QtQuickControls2WindowsStylePlugin::name() const return QStringLiteral("Windows"); } -void QtQuickControls2WindowsStylePlugin::initializeTheme(QQuickTheme */*theme*/) +void QtQuickControls2WindowsStylePlugin::initializeTheme(QQuickTheme * /*theme*/) { } diff --git a/src/quicknativestyle/qstyle/qquickcommonstyle.cpp b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp index 4a23039aad..c5797009f7 100644 --- a/src/quicknativestyle/qstyle/qquickcommonstyle.cpp +++ b/src/quicknativestyle/qstyle/qquickcommonstyle.cpp @@ -4704,7 +4704,7 @@ QFont QCommonStyle::font(QStyle::ControlElement element, const QStyle::State sta return QGuiApplication::font(); } -QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement /*ce*/, const QStyleOption */*opt*/, const QSize &imageSize) const +QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement /*ce*/, const QStyleOption * /*opt*/, const QSize &imageSize) const { // By default, we just divide the image at the center int w = imageSize.width() / 2; @@ -4712,7 +4712,7 @@ QMargins QCommonStyle::ninePatchMargins(QStyle::ControlElement /*ce*/, const QSt return QMargins(w, h, w, h); } -QMargins QCommonStyle::ninePatchMargins(QStyle::ComplexControl /*cc*/, const QStyleOptionComplex */*opt*/, const QSize &imageSize) const +QMargins QCommonStyle::ninePatchMargins(QStyle::ComplexControl /*cc*/, const QStyleOptionComplex * /*opt*/, const QSize &imageSize) const { // By default, we just divide the image at the center int w = imageSize.width() / 2; diff --git a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp index 7b638704ab..e09d327ace 100644 --- a/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp +++ b/src/quicknativestyle/qtquickcontrols2nativestyleplugin.cpp @@ -155,7 +155,7 @@ void QtQuickControls2NativeStylePlugin::initializeEngine(QQmlEngine *engine, con QQuickNativeStyle::setStyle(style); } -void QtQuickControls2NativeStylePlugin::initializeTheme(QQuickTheme */*theme*/) +void QtQuickControls2NativeStylePlugin::initializeTheme(QQuickTheme * /*theme*/) { } diff --git a/src/quicktemplates2/qtquicktemplates2plugin.cpp b/src/quicktemplates2/qtquicktemplates2plugin.cpp index da89601dd3..644d7dce84 100644 --- a/src/quicktemplates2/qtquicktemplates2plugin.cpp +++ b/src/quicktemplates2/qtquicktemplates2plugin.cpp @@ -84,7 +84,7 @@ QtQuickTemplates2Plugin::~QtQuickTemplates2Plugin() // initialization and cleanup, as plugins are not unloaded on macOS. } -void QtQuickTemplates2Plugin::registerTypes(const char */*uri*/) +void QtQuickTemplates2Plugin::registerTypes(const char * /*uri*/) { #if QT_CONFIG(shortcut) originalContextMatcher = qt_quick_shortcut_context_matcher(); |