From dccc87d8af42c6bde7f377b5647b1118e59f4b58 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 23 Dec 2020 19:01:04 +0200 Subject: [PATCH 01/14] Cppcheck warning. --- src/libs/vlayout/vprintlayout.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/libs/vlayout/vprintlayout.h b/src/libs/vlayout/vprintlayout.h index 46e1033f2..f4cc8e12c 100644 --- a/src/libs/vlayout/vprintlayout.h +++ b/src/libs/vlayout/vprintlayout.h @@ -44,8 +44,8 @@ class VPrintLayout : public QObject { Q_OBJECT public: - VPrintLayout(QObject *parent = nullptr); - ~VPrintLayout(); + explicit VPrintLayout(QObject *parent = nullptr); + virtual ~VPrintLayout(); auto FileName() const -> QString; void SetFileName(const QString &fileName); From 54bad5d29c5b82a890fcbe511a8020fd21a2932b Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 23 Dec 2020 20:08:33 +0200 Subject: [PATCH 02/14] Fix build. --- src/libs/vlayout/dialogs/dialoglayoutscale.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/libs/vlayout/dialogs/dialoglayoutscale.cpp b/src/libs/vlayout/dialogs/dialoglayoutscale.cpp index 04b705537..a5d566c0d 100644 --- a/src/libs/vlayout/dialogs/dialoglayoutscale.cpp +++ b/src/libs/vlayout/dialogs/dialoglayoutscale.cpp @@ -32,6 +32,7 @@ #include "../vmisc/vsettings.h" #include +#include //--------------------------------------------------------------------------------------------------------------------- DialogLayoutScale::DialogLayoutScale(bool printTiled, QWidget *parent) From 60c6c9e5f42ff738de97ec933665f78daacef3d9 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 24 Dec 2020 07:32:31 +0200 Subject: [PATCH 03/14] Fix build. --- src/libs/vlayout/vlayout.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 18f5ddf14..9a8c4044a 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -7,7 +7,7 @@ # File with common stuff for whole project include(../../../common.pri) -QT += core gui widgets printsupport xml concurrent +QT += core gui widgets printsupport xml concurrent svg # Name of library TARGET = vlayout From de6e4d6fed0d5a56edf86d1780bce92f18b6dc60 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 24 Dec 2020 13:04:56 +0200 Subject: [PATCH 04/14] Fix a test crash. --- src/libs/vmisc/testvapplication.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/vmisc/testvapplication.h b/src/libs/vmisc/testvapplication.h index a4eea8699..c1bf6d993 100644 --- a/src/libs/vmisc/testvapplication.h +++ b/src/libs/vmisc/testvapplication.h @@ -29,7 +29,7 @@ #ifndef TESTVAPPLICATION_H #define TESTVAPPLICATION_H -#include "vabstractapplication.h" +#include "vabstractvalapplication.h" #include "projectversion.h" #include "../vmisc/vsettings.h" @@ -40,12 +40,12 @@ class VTestSettings; -class TestVApplication : public VAbstractApplication +class TestVApplication : public VAbstractValApplication { Q_OBJECT public: TestVApplication(int &argc, char ** argv) - : VAbstractApplication(argc, argv), + : VAbstractValApplication(argc, argv), m_trVars(nullptr) { setApplicationName("ValentinaTest"); From 968b41aa743bd221c98633b4ba468b1912c38877 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 24 Dec 2020 13:27:49 +0200 Subject: [PATCH 05/14] Improve suppressing a compiler warnings on macos. --- common.pri | 37 ++++++++++++++++--------------------- 1 file changed, 16 insertions(+), 21 deletions(-) diff --git a/common.pri b/common.pri index 9cf33735d..4de506316 100644 --- a/common.pri +++ b/common.pri @@ -346,27 +346,22 @@ ISYSTEM += \ -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent" } else { -ISYSTEM += \ - -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtWidgets.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtXml.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtXml.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtGui.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtGui.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtXmlPatterns.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtXmlPatterns.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtCore.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtCore.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtPrintSupport.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtPrintSupport.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtSvg.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtSvg.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtNetwork.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtNetwork.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtTest.framework/Versions/5/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Headers/" \ - -isystem "$$[QT_INSTALL_LIBS]/QtConcurrent.framework/Versions/5/Headers/" +LIBS_USED_FOR_QT = \ + QtCore \ + QtSvg \ + QtXml \ + QtPrintSupport \ + QtXmlPatterns \ + QtWidgets \ + QtGui \ + QtNetwork \ + QtTest \ + QtConcurrent + +for(somelib, $$list($$LIBS_USED_FOR_QT)) { + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Versions/5/Headers/ + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Headers/ +} } # Usefull GCC warnings keys. From 26457152cded4b4df8c76764cae7f585401b7a57 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Thu, 24 Dec 2020 13:32:40 +0200 Subject: [PATCH 06/14] Remove deprecated QPrinter methods. --- src/libs/vlayout/vlayoutexporter.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/libs/vlayout/vlayoutexporter.cpp b/src/libs/vlayout/vlayoutexporter.cpp index c085dc5bb..381b74d5c 100644 --- a/src/libs/vlayout/vlayoutexporter.cpp +++ b/src/libs/vlayout/vlayoutexporter.cpp @@ -179,7 +179,7 @@ void VLayoutExporter::ExportToPDF(QGraphicsScene *scene) const printer.setOutputFileName(m_fileName); printer.setDocName(QFileInfo(m_fileName).fileName()); printer.setResolution(static_cast(PrintDPI)); - printer.setOrientation(QPrinter::Portrait); + printer.setPageOrientation(QPageLayout::Portrait); printer.setFullPage(m_ignorePrinterMargins); qreal width = FromPixel(m_imageRect.width() * m_xScale + m_margins.left() + m_margins.right(), Unit::Mm); From b8c899bbf530933a7a1e25f0840249e9b14bd58c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 25 Dec 2020 09:31:34 +0200 Subject: [PATCH 07/14] Fix GCC warning. --- src/app/valentina/mainwindowsnogui.cpp | 16 ++-------------- src/app/valentina/mainwindowsnogui.h | 26 +++++++++++++------------- 2 files changed, 15 insertions(+), 27 deletions(-) diff --git a/src/app/valentina/mainwindowsnogui.cpp b/src/app/valentina/mainwindowsnogui.cpp index a90058f15..20f9ce3be 100644 --- a/src/app/valentina/mainwindowsnogui.cpp +++ b/src/app/valentina/mainwindowsnogui.cpp @@ -127,22 +127,10 @@ void InsertGlobalContours(const QList &scenes, const QListTrVars(), qApp->patternUnitsP(), valentinaNamespace)), - doc(nullptr), - undoAction(nullptr), - redoAction(nullptr), - actionDockWidgetToolOptions(nullptr), - actionDockWidgetGroups(nullptr), - isNoScaling(false), - isNeedAutosave(false), + pattern(new VContainer(qApp->TrVars(), qApp->patternUnitsP(), valentinaNamespace)) #if defined(Q_OS_WIN32) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) - m_taskbarButton(new QWinTaskbarButton(this)), - m_taskbarProgress(nullptr), + ,m_taskbarButton(new QWinTaskbarButton(this)) #endif - m_dialogSaveLayout() { InitTempLayoutScene(); diff --git a/src/app/valentina/mainwindowsnogui.h b/src/app/valentina/mainwindowsnogui.h index 61e48b6b3..27d25e471 100644 --- a/src/app/valentina/mainwindowsnogui.h +++ b/src/app/valentina/mainwindowsnogui.h @@ -86,41 +86,41 @@ public slots: protected slots: void ExportFMeasurementsToCSV(); protected: - QVector listDetails; + QVector listDetails{}; /** @brief currentScene pointer to current scene. */ - QGraphicsScene *currentScene; + QGraphicsScene *currentScene{nullptr}; - QGraphicsScene *tempSceneLayout; + QGraphicsScene *tempSceneLayout{nullptr}; /** @brief pattern container with data (points, arcs, splines, spline paths, variables) */ VContainer *pattern; /** @brief doc dom document container */ - VPattern *doc; + VPattern *doc{nullptr}; QList gcontours{}; QVector > detailsOnLayout{}; - QAction *undoAction; - QAction *redoAction; - QAction *actionDockWidgetToolOptions; - QAction *actionDockWidgetGroups; + QAction *undoAction{nullptr}; + QAction *redoAction{nullptr}; + QAction *actionDockWidgetToolOptions{nullptr}; + QAction *actionDockWidgetGroups{nullptr}; - bool isNoScaling; - bool isNeedAutosave; + bool isNoScaling{false}; + bool isNeedAutosave{false}; VPrintLayout *m_layoutSettings{new VPrintLayout(this)}; - QSharedPointer m_dialogSaveLayout; - /** @brief mouseCoordinate pointer to label who show mouse coordinate. */ QPointer m_mouseCoordinate{nullptr}; QPointer m_unreadPatternMessage{nullptr}; + QSharedPointer m_dialogSaveLayout{}; + #if defined(Q_OS_WIN) && QT_VERSION >= QT_VERSION_CHECK(5, 7, 0) QWinTaskbarButton *m_taskbarButton; - QWinTaskbarProgress *m_taskbarProgress; + QWinTaskbarProgress *m_taskbarProgress{nullptr}; #endif static QVector PrepareDetailsForLayout(const QVector &details); From abe92c667ded46ee6a2970863fd4c25c4fdb3f24 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 25 Dec 2020 09:40:18 +0200 Subject: [PATCH 08/14] Temporary enable full output for macosx. --- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 2 +- src/libs/fervor/fervor.pro | 2 +- src/libs/ifc/ifc.pro | 2 +- src/libs/qmuparser/qmuparser.pro | 2 +- src/libs/vdxf/vdxf.pro | 2 +- src/libs/vformat/vformat.pro | 2 +- src/libs/vgeometry/vgeometry.pro | 2 +- src/libs/vlayout/vlayout.pro | 2 +- src/libs/vmisc/vmisc.pro | 2 +- src/libs/vobj/vobj.pro | 2 +- src/libs/vpatterndb/vpatterndb.pro | 2 +- src/libs/vpropertyexplorer/vpropertyexplorer.pro | 2 +- src/libs/vtest/vtest.pro | 2 +- src/libs/vtools/vtools.pro | 2 +- src/libs/vwidgets/vwidgets.pro | 2 +- src/test/CollectionTest/CollectionTest.pro | 2 +- src/test/ParserTest/ParserTest.pro | 2 +- src/test/TranslationsTest/TranslationsTest.pro | 2 +- src/test/ValentinaTest/ValentinaTest.pro | 2 +- 20 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a1bfd651e..a0b9c1afe 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -279,7 +279,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index c02d6d0a6..7cf5839ee 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index 279689cbf..c1e49429d 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index bb30563d5..9cb619406 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -73,7 +73,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 3ec0b161c..3e412e4e3 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vdxf/vdxf.pro b/src/libs/vdxf/vdxf.pro index 15b0941ee..f3f26b65e 100644 --- a/src/libs/vdxf/vdxf.pro +++ b/src/libs/vdxf/vdxf.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - CONFIG += silent + !macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index ac5e65aea..9187bf2fb 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -66,7 +66,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index e922fd0db..5b622ada1 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 9a8c4044a..9961d3bd3 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index 38e39515b..bbf405eeb 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -71,7 +71,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index cc73b3964..681be5e3c 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -60,7 +60,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 49c48e227..0da411dc1 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -63,7 +63,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 54768e705..2db1877d6 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -82,7 +82,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro index d4addab71..729b3b36e 100644 --- a/src/libs/vtest/vtest.pro +++ b/src/libs/vtest/vtest.pro @@ -64,7 +64,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 91ce3d161..4b58592c9 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -70,7 +70,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index c6884838e..a32cd65eb 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 8d1262865..0193c67af 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index cc6de287f..968369fba 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += QT_NO_DEBUG_OUTPUT noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index 5ef2c3862..9cd290f98 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -83,7 +83,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index 7cff6b9be..fd9271f60 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -113,7 +113,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:CONFIG += silent + !*msvc*:!macx:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll From 2e99c3322b1b1c1ea64af8f0041a45352a6e383e Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 25 Dec 2020 09:53:16 +0200 Subject: [PATCH 09/14] Fix path to system headers. --- common.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 4de506316..0b2fb7012 100644 --- a/common.pri +++ b/common.pri @@ -359,8 +359,8 @@ LIBS_USED_FOR_QT = \ QtConcurrent for(somelib, $$list($$LIBS_USED_FOR_QT)) { - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Versions/5/Headers/ - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/lib/$${somelib}.framework/Headers/ + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers/ + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers/ } } From 2627c08cf7d23520c65e7e7f9922475361c66c3c Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Fri, 25 Dec 2020 10:07:25 +0200 Subject: [PATCH 10/14] Try without trailing slash. --- common.pri | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 0b2fb7012..6da9e1601 100644 --- a/common.pri +++ b/common.pri @@ -359,8 +359,8 @@ LIBS_USED_FOR_QT = \ QtConcurrent for(somelib, $$list($$LIBS_USED_FOR_QT)) { - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers/ - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers/ + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers } } From 12e2c8aabab70fa8db0295c5c959fcadc6400f27 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 18:29:19 +0200 Subject: [PATCH 11/14] Use QMAKE_DEFAULT_INCDIRS to extend list of system directories. --- common.pri | 9 +++++++-- src/app/valentina/valentina.pro | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/common.pri b/common.pri index 6da9e1601..8f2ea2464 100644 --- a/common.pri +++ b/common.pri @@ -359,8 +359,13 @@ LIBS_USED_FOR_QT = \ QtConcurrent for(somelib, $$list($$LIBS_USED_FOR_QT)) { - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers + contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" ) { + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" + } + + contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" ) { + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" + } } } diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 7cf5839ee..8f8c6db24 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -127,6 +127,7 @@ message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) message(Settings: $$[QT_INSTALL_SETTINGS]) message(Examples: $$[QT_INSTALL_EXAMPLES]) +message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS}) # Path to recource file. win32:RC_FILE = share/resources/valentina.rc From a980cd36c66eb8f574d700262d18e4e72da7c941 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 18:37:16 +0200 Subject: [PATCH 12/14] Try another approach. --- common.pri | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/common.pri b/common.pri index 8f2ea2464..758707079 100644 --- a/common.pri +++ b/common.pri @@ -359,13 +359,8 @@ LIBS_USED_FOR_QT = \ QtConcurrent for(somelib, $$list($$LIBS_USED_FOR_QT)) { - contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" ) { - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" - } - - contains( QMAKE_DEFAULT_INCDIRS, "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" ) { - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" - } + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" + QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" } } From 445d5c8503e0fabf2aa0775eeda3e6d1118f26a7 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 18:52:02 +0200 Subject: [PATCH 13/14] Fox some reason if to list a system directory in QMAKE_DEFAULT_INCDIRS it will not be automatically added to arguments by qmake. --- common.pri | 3 +++ 1 file changed, 3 insertions(+) diff --git a/common.pri b/common.pri index 758707079..58380693f 100644 --- a/common.pri +++ b/common.pri @@ -361,6 +361,9 @@ LIBS_USED_FOR_QT = \ for(somelib, $$list($$LIBS_USED_FOR_QT)) { QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" + + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers + ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers } } From 3c0c62468256e29a227bc2a20d7275ee3566b08d Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Sat, 26 Dec 2020 19:44:55 +0200 Subject: [PATCH 14/14] Don't check warnings for a legacy mac os x build. --- .travis.yml | 6 +++- common.pri | 32 ++++++------------- src/app/tape/tape.pro | 2 +- src/app/valentina/valentina.pro | 3 +- src/libs/fervor/fervor.pro | 2 +- src/libs/ifc/ifc.pro | 2 +- src/libs/qmuparser/qmuparser.pro | 2 +- src/libs/vformat/vformat.pro | 2 +- src/libs/vgeometry/vgeometry.pro | 2 +- src/libs/vlayout/vlayout.pro | 2 +- src/libs/vmisc/vmisc.pro | 2 +- src/libs/vobj/vobj.pro | 2 +- src/libs/vpatterndb/vpatterndb.pro | 2 +- .../vpropertyexplorer/vpropertyexplorer.pro | 2 +- src/libs/vtest/vtest.pro | 2 +- src/libs/vtools/vtools.pro | 2 +- src/libs/vwidgets/vwidgets.pro | 2 +- src/test/CollectionTest/CollectionTest.pro | 2 +- src/test/ParserTest/ParserTest.pro | 2 +- .../TranslationsTest/TranslationsTest.pro | 2 +- src/test/ValentinaTest/ValentinaTest.pro | 2 +- 21 files changed, 34 insertions(+), 43 deletions(-) diff --git a/.travis.yml b/.travis.yml index 002229d15..dda0880d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -105,7 +105,11 @@ before_script: qmake ../Valentina.pro -r -spec linux-clang CONFIG+=noDebugSymbols CONFIG+=checkWarnings CONFIG+=noTests; fi else - qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests; + if [[ "$LEGACY" = false ]]; then + qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=checkWarnings CONFIG+=noTests; + else + qmake ../Valentina.pro -r CONFIG+=noDebugSymbols CONFIG+=no_ccache CONFIG+=noTests; + fi fi script: - "$CXX --version" diff --git a/common.pri b/common.pri index 58380693f..6662944ef 100644 --- a/common.pri +++ b/common.pri @@ -329,23 +329,6 @@ defineReplace(FindLatestTagDistance){ # In debug mode on Unix system we use all usefull for us compilers keys for checking errors. # Also trying make all possible for speed up build time. unix { - -!macx{ -# Key -isystem disable checking errors in system headers. Mark ignore warnings Qt headers. -ISYSTEM += \ - -isystem "$$[QT_INSTALL_HEADERS]" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtWidgets" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtXml" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtGui" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtXmlPatterns" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtCore" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtPrintSupport" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtSvg" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtNetwork" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtTest" \ - -isystem "$$[QT_INSTALL_HEADERS]/QtConcurrent" - -} else { LIBS_USED_FOR_QT = \ QtCore \ QtSvg \ @@ -358,12 +341,17 @@ LIBS_USED_FOR_QT = \ QtTest \ QtConcurrent -for(somelib, $$list($$LIBS_USED_FOR_QT)) { - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" - QMAKE_DEFAULT_INCDIRS += "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" +# Key -isystem disable checking errors in system headers. Marking ignore for warnings in Qt headers. +!macx{ +ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]" - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers - ISYSTEM += -isystem $$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers +for(somelib, $$list($$LIBS_USED_FOR_QT)) { + ISYSTEM += -isystem "$$[QT_INSTALL_HEADERS]/$${somelib}" +} +} else { +for(somelib, $$list($$LIBS_USED_FOR_QT)) { + ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Versions/5/Headers" + ISYSTEM += -isystem "$$[QT_INSTALL_LIBS]/$${somelib}.framework/Headers" } } diff --git a/src/app/tape/tape.pro b/src/app/tape/tape.pro index a0b9c1afe..a1bfd651e 100644 --- a/src/app/tape/tape.pro +++ b/src/app/tape/tape.pro @@ -279,7 +279,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/app/valentina/valentina.pro b/src/app/valentina/valentina.pro index 8f8c6db24..c02d6d0a6 100644 --- a/src/app/valentina/valentina.pro +++ b/src/app/valentina/valentina.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll @@ -127,7 +127,6 @@ message(Data files: $$[QT_INSTALL_DATA]) message(Translation files: $$[QT_INSTALL_TRANSLATIONS]) message(Settings: $$[QT_INSTALL_SETTINGS]) message(Examples: $$[QT_INSTALL_EXAMPLES]) -message(Default include dirs: $${QMAKE_DEFAULT_INCDIRS}) # Path to recource file. win32:RC_FILE = share/resources/valentina.rc diff --git a/src/libs/fervor/fervor.pro b/src/libs/fervor/fervor.pro index c1e49429d..279689cbf 100644 --- a/src/libs/fervor/fervor.pro +++ b/src/libs/fervor/fervor.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/ifc/ifc.pro b/src/libs/ifc/ifc.pro index 9cb619406..bb30563d5 100644 --- a/src/libs/ifc/ifc.pro +++ b/src/libs/ifc/ifc.pro @@ -73,7 +73,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/qmuparser/qmuparser.pro b/src/libs/qmuparser/qmuparser.pro index 3e412e4e3..3ec0b161c 100644 --- a/src/libs/qmuparser/qmuparser.pro +++ b/src/libs/qmuparser/qmuparser.pro @@ -87,7 +87,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vformat/vformat.pro b/src/libs/vformat/vformat.pro index 9187bf2fb..ac5e65aea 100644 --- a/src/libs/vformat/vformat.pro +++ b/src/libs/vformat/vformat.pro @@ -66,7 +66,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vgeometry/vgeometry.pro b/src/libs/vgeometry/vgeometry.pro index 5b622ada1..e922fd0db 100644 --- a/src/libs/vgeometry/vgeometry.pro +++ b/src/libs/vgeometry/vgeometry.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vlayout/vlayout.pro b/src/libs/vlayout/vlayout.pro index 9961d3bd3..9a8c4044a 100644 --- a/src/libs/vlayout/vlayout.pro +++ b/src/libs/vlayout/vlayout.pro @@ -65,7 +65,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vmisc/vmisc.pro b/src/libs/vmisc/vmisc.pro index bbf405eeb..38e39515b 100644 --- a/src/libs/vmisc/vmisc.pro +++ b/src/libs/vmisc/vmisc.pro @@ -71,7 +71,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vobj/vobj.pro b/src/libs/vobj/vobj.pro index 681be5e3c..cc73b3964 100644 --- a/src/libs/vobj/vobj.pro +++ b/src/libs/vobj/vobj.pro @@ -60,7 +60,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpatterndb/vpatterndb.pro b/src/libs/vpatterndb/vpatterndb.pro index 0da411dc1..49c48e227 100644 --- a/src/libs/vpatterndb/vpatterndb.pro +++ b/src/libs/vpatterndb/vpatterndb.pro @@ -63,7 +63,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vpropertyexplorer/vpropertyexplorer.pro b/src/libs/vpropertyexplorer/vpropertyexplorer.pro index 2db1877d6..54768e705 100644 --- a/src/libs/vpropertyexplorer/vpropertyexplorer.pro +++ b/src/libs/vpropertyexplorer/vpropertyexplorer.pro @@ -82,7 +82,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtest/vtest.pro b/src/libs/vtest/vtest.pro index 729b3b36e..d4addab71 100644 --- a/src/libs/vtest/vtest.pro +++ b/src/libs/vtest/vtest.pro @@ -64,7 +64,7 @@ CONFIG(debug, debug|release){ # Debug mode }else{ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vtools/vtools.pro b/src/libs/vtools/vtools.pro index 4b58592c9..91ce3d161 100644 --- a/src/libs/vtools/vtools.pro +++ b/src/libs/vtools/vtools.pro @@ -70,7 +70,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/libs/vwidgets/vwidgets.pro b/src/libs/vwidgets/vwidgets.pro index a32cd65eb..c6884838e 100644 --- a/src/libs/vwidgets/vwidgets.pro +++ b/src/libs/vwidgets/vwidgets.pro @@ -62,7 +62,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/CollectionTest/CollectionTest.pro b/src/test/CollectionTest/CollectionTest.pro index 0193c67af..8d1262865 100644 --- a/src/test/CollectionTest/CollectionTest.pro +++ b/src/test/CollectionTest/CollectionTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ParserTest/ParserTest.pro b/src/test/ParserTest/ParserTest.pro index 968369fba..cc6de287f 100644 --- a/src/test/ParserTest/ParserTest.pro +++ b/src/test/ParserTest/ParserTest.pro @@ -71,7 +71,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += QT_NO_DEBUG_OUTPUT noDebugSymbols{ # For enable run qmake with CONFIG+=noDebugSymbols diff --git a/src/test/TranslationsTest/TranslationsTest.pro b/src/test/TranslationsTest/TranslationsTest.pro index 9cd290f98..5ef2c3862 100644 --- a/src/test/TranslationsTest/TranslationsTest.pro +++ b/src/test/TranslationsTest/TranslationsTest.pro @@ -83,7 +83,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll diff --git a/src/test/ValentinaTest/ValentinaTest.pro b/src/test/ValentinaTest/ValentinaTest.pro index fd9271f60..7cff6b9be 100644 --- a/src/test/ValentinaTest/ValentinaTest.pro +++ b/src/test/ValentinaTest/ValentinaTest.pro @@ -113,7 +113,7 @@ include(warnings.pri) CONFIG(release, debug|release){ # Release mode - !*msvc*:!macx:CONFIG += silent + !*msvc*:CONFIG += silent DEFINES += V_NO_ASSERT !unix:*g++*{ QMAKE_CXXFLAGS += -fno-omit-frame-pointer # Need for exchndl.dll