From 2565f8803835564277deb3d7445ad04062344eb3 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 6 Apr 2019 10:25:14 +0300 Subject: [PATCH] Disable MSVC warning C4868 globally. Cannot suppress it locally. --HG-- branch : develop --- common.pri | 3 ++- src/app/valentina/core/vcmdexport.cpp | 3 --- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/common.pri b/common.pri index c15fc9da2..826d050a5 100644 --- a/common.pri +++ b/common.pri @@ -861,5 +861,6 @@ MSVC_DEBUG_CXXFLAGS += \ -wd4599 \ -wd4371 \ -wd4718 \ - -wd4946 + -wd4946 \ + -wd4868 # compiler may not enforce left-to-right evaluation order in braced initializer list } diff --git a/src/app/valentina/core/vcmdexport.cpp b/src/app/valentina/core/vcmdexport.cpp index 91b247877..02464e690 100644 --- a/src/app/valentina/core/vcmdexport.cpp +++ b/src/app/valentina/core/vcmdexport.cpp @@ -565,8 +565,6 @@ PageOrientation VCommandLine::OptTiledPageOrientation() const //--------------------------------------------------------------------------------------------------------------------- void VCommandLine::InitCommandLineOptions() { -QT_WARNING_PUSH -QT_WARNING_DISABLE_MSVC(4868) //keep in mind order here - that is how user will see it, so group-up for usability //================================================================================================================= parser.addOptions({ @@ -731,7 +729,6 @@ QT_WARNING_DISABLE_MSVC(4868) translate("VCommandLine", "Set tiled page orienatation to landscape (export mode). Default value if not set " "portrait.")} }); -QT_WARNING_POP } //---------------------------------------------------------------------------------------------------------------------