From 003c9bf33f5c1cc2f176112a7842d2604465d5a4 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Wed, 17 Aug 2022 15:51:35 +0300 Subject: [PATCH] Fix build. --- .../puzzlepreferencesconfigurationpage.cpp | 3 + .../puzzlepreferenceslayoutpage.cpp | 3 + .../puzzle/dialogs/dialogsavemanuallayout.cpp | 3 + src/app/puzzle/undocommands/vpundocommand.cpp | 4 + src/app/puzzle/vpmainwindow.cpp | 9 ++ .../tapepreferencesconfigurationpage.cpp | 3 + .../tape/dialogs/dialogdimensionlabels.cpp | 3 + .../dialogs/dialogmeasurementscsvcolumns.cpp | 3 + .../tape/dialogs/dialogrestrictdimension.cpp | 4 +- src/app/tape/tmainwindow.cpp | 11 +- .../preferencesconfigurationpage.cpp | 3 + .../configpages/preferencespatternpage.cpp | 3 + .../valentina/dialogs/dialogincrements.cpp | 3 + .../dialogs/dialoglayoutprogress.cpp | 6 + .../dialogs/dialoglayoutsettings.cpp | 3 + .../dialogs/dialogpatternproperties.cpp | 3 + .../valentina/dialogs/dialogsavelayout.cpp | 3 + .../dialogs/vwidgetbackgroundimages.cpp | 3 + src/app/valentina/dialogs/vwidgetdetails.cpp | 6 + src/app/valentina/mainwindow.cpp | 14 ++ src/libs/ifc/xml/vabstractpattern.cpp | 2 +- src/libs/qmuparser/make_unique.h | 141 ++++++++++++++++++ src/libs/qmuparser/qmuparser.pri | 3 +- src/libs/qmuparser/qmuparsertoken.h | 1 + src/libs/vdxf/libdxfrw/drw_interface.h | 4 + src/libs/vlayout/vposter.cpp | 4 + src/libs/vmisc/compatibility.h | 11 ++ src/libs/vmisc/def.h | 3 + .../floatItemData/vabstractfloatitemdata_p.h | 3 + .../floatItemData/vgrainlinedata_p.h | 3 + .../floatItemData/vpatternlabeldata_p.h | 4 + src/libs/vpatterndb/vpiece.cpp | 4 + .../plugins/vfilepropertyeditor.h | 4 + .../dialogs/support/dialogeditlabel.cpp | 3 + .../dialogs/tools/dialogcubicbezierpath.cpp | 3 + .../dialogs/tools/dialogflippingbyaxis.cpp | 3 + .../dialogs/tools/dialogflippingbyline.cpp | 3 + .../dialogs/tools/dialoglineintersect.cpp | 4 +- src/libs/vtools/dialogs/tools/dialogmove.cpp | 3 + .../vtools/dialogs/tools/dialogrotation.cpp | 3 + .../vtools/dialogs/tools/dialogsplinepath.cpp | 3 + .../dialogs/tools/piece/dialoginsertnode.cpp | 3 + .../dialogs/tools/piece/dialogpiecepath.cpp | 3 + .../vtools/dialogs/tools/piece/dialogpin.cpp | 3 + .../dialogs/tools/piece/dialogplacelabel.cpp | 3 + .../tools/piece/dialogseamallowance.cpp | 3 + src/libs/vtools/tools/vtoolseamallowance.cpp | 3 + src/libs/vwidgets/vabstractmainwindow.h | 3 + .../TranslationsTest/tst_buitinregexp.cpp | 4 +- .../tst_measurementregexp.cpp | 4 +- .../tst_tslocaletranslation.cpp | 4 + 51 files changed, 329 insertions(+), 9 deletions(-) create mode 100644 src/libs/qmuparser/make_unique.h diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp index 8fefa097c..520e18859 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferencesconfigurationpage.cpp @@ -29,6 +29,9 @@ #include "puzzlepreferencesconfigurationpage.h" #include "ui_puzzlepreferencesconfigurationpage.h" #include "../../vpapplication.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) //--------------------------------------------------------------------------------------------------------------------- PuzzlePreferencesConfigurationPage::PuzzlePreferencesConfigurationPage(QWidget *parent) : diff --git a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp index 2152ed44d..28076e555 100644 --- a/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp +++ b/src/app/puzzle/dialogs/configpages/puzzlepreferenceslayoutpage.cpp @@ -28,6 +28,9 @@ #include "puzzlepreferenceslayoutpage.h" #include "ui_puzzlepreferenceslayoutpage.h" #include "vpapplication.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) //--------------------------------------------------------------------------------------------------------------------- PuzzlePreferencesLayoutPage::PuzzlePreferencesLayoutPage(QWidget *parent) : diff --git a/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp index 52420034e..31a2fc722 100644 --- a/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp +++ b/src/app/puzzle/dialogs/dialogsavemanuallayout.cpp @@ -30,6 +30,9 @@ #include "../vpapplication.h" #include "../ifc/exception/vexception.h" #include "../vlayout/vlayoutexporter.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/app/puzzle/undocommands/vpundocommand.cpp b/src/app/puzzle/undocommands/vpundocommand.cpp index afefc5d3e..bf1918940 100644 --- a/src/app/puzzle/undocommands/vpundocommand.cpp +++ b/src/app/puzzle/undocommands/vpundocommand.cpp @@ -27,6 +27,10 @@ *************************************************************************/ #include "vpundocommand.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) + QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes") QT_WARNING_DISABLE_INTEL(1418) diff --git a/src/app/puzzle/vpmainwindow.cpp b/src/app/puzzle/vpmainwindow.cpp index 603f2e285..d8c709695 100644 --- a/src/app/puzzle/vpmainwindow.cpp +++ b/src/app/puzzle/vpmainwindow.cpp @@ -64,6 +64,9 @@ #include "../vdxf/libdxfrw/drw_base.h" #include "../vmisc/dialogs/dialogselectlanguage.h" #include "../vmisc/lambdaconstants.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "vptilefactory.h" #include "layout/vppiece.h" @@ -85,7 +88,9 @@ Q_LOGGING_CATEGORY(pWindow, "p.window") // NOLINT QT_WARNING_POP +#if __cplusplus >= 201402L using namespace std::chrono_literals; +#endif namespace { @@ -383,7 +388,11 @@ VPMainWindow::VPMainWindow(const VPCommandLinePtr &cmd, QWidget *parent) : if (m_cmd->IsGuiEnabled()) { +#if __cplusplus >= 201402L QTimer::singleShot(1s, this, &VPMainWindow::SetDefaultGUILanguage); +#else + QTimer::singleShot(1000, this, &VPMainWindow::SetDefaultGUILanguage); +#endif } } diff --git a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp index daa272bbe..d35c25040 100644 --- a/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp +++ b/src/app/tape/dialogs/configpages/tapepreferencesconfigurationpage.cpp @@ -31,6 +31,9 @@ #include "../../mapplication.h" #include "../../vtapesettings.h" #include "../vpatterndb/pmsystems.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) //--------------------------------------------------------------------------------------------------------------------- TapePreferencesConfigurationPage::TapePreferencesConfigurationPage(QWidget *parent) diff --git a/src/app/tape/dialogs/dialogdimensionlabels.cpp b/src/app/tape/dialogs/dialogdimensionlabels.cpp index 02411b0b1..675930a68 100644 --- a/src/app/tape/dialogs/dialogdimensionlabels.cpp +++ b/src/app/tape/dialogs/dialogdimensionlabels.cpp @@ -27,6 +27,9 @@ *************************************************************************/ #include "dialogdimensionlabels.h" #include "ui_dialogdimensionlabels.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) //--------------------------------------------------------------------------------------------------------------------- DialogDimensionLabels::DialogDimensionLabels(const QMap &dimensions, diff --git a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp index e8998b914..f4199f094 100644 --- a/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp +++ b/src/app/tape/dialogs/dialogmeasurementscsvcolumns.cpp @@ -29,6 +29,9 @@ #include "ui_dialogmeasurementscsvcolumns.h" #include "../vmisc/qxtcsvmodel.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vtools/dialogs/dialogtoolbox.h" #include diff --git a/src/app/tape/dialogs/dialogrestrictdimension.cpp b/src/app/tape/dialogs/dialogrestrictdimension.cpp index 087f5537f..5ea0bec52 100644 --- a/src/app/tape/dialogs/dialogrestrictdimension.cpp +++ b/src/app/tape/dialogs/dialogrestrictdimension.cpp @@ -33,7 +33,9 @@ #include "../vpatterndb/variables/vmeasurement.h" #include "../vwidgets/vdecorationaligningdelegate.h" - +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) namespace { diff --git a/src/app/tape/tmainwindow.cpp b/src/app/tape/tmainwindow.cpp index fde56f3f2..59429a0f0 100644 --- a/src/app/tape/tmainwindow.cpp +++ b/src/app/tape/tmainwindow.cpp @@ -49,6 +49,9 @@ #include "../vmisc/qxtcsvmodel.h" #include "../vmisc/dialogs/dialogexporttocsv.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "vlitepattern.h" #include "../qmuparser/qmudef.h" #include "../vtools/dialogs/support/dialogeditwrongformula.h" @@ -71,7 +74,9 @@ #include #include +#if __cplusplus >= 201402L using namespace std::chrono_literals; +#endif #if defined(Q_OS_MAC) #include @@ -160,7 +165,7 @@ void InitDimensionYWZItems(const QVector &bases, const DimesionLabels &la } //--------------------------------------------------------------------------------------------------------------------- -auto ConverToDouble(QString text, const QString &error) +auto ConverToDouble(QString text, const QString &error) -> qreal { text.replace(QStringLiteral(" "), QString()); text = VTranslateVars::TryFormulaFromUser(text, VAbstractApplication::VApp()->Settings()->GetOsSeparator()); @@ -237,7 +242,11 @@ TMainWindow::TMainWindow(QWidget *parent) if (MApplication::VApp()->IsAppInGUIMode()) { +#if __cplusplus >= 201402L QTimer::singleShot(1s, this, &TMainWindow::SetDefaultGUILanguage); +#else + QTimer::singleShot(1000, this, &TMainWindow::SetDefaultGUILanguage); +#endif } } diff --git a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp index 395f6bcc2..1e48107a2 100644 --- a/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencesconfigurationpage.cpp @@ -32,6 +32,9 @@ #include "../vpatterndb/pmsystems.h" #include "../vmisc/vvalentinasettings.h" #include "../vmisc/literals.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp index f2daa346e..a36ed1bca 100644 --- a/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp +++ b/src/app/valentina/dialogs/configpages/preferencespatternpage.cpp @@ -32,6 +32,9 @@ #include "../dialogknownmaterials.h" #include "../vmisc/vvalentinasettings.h" #include "../vmisc/vabstractvalapplication.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vwidgets/vmaingraphicsview.h" #include "../ifc/xml/vabstractpattern.h" diff --git a/src/app/valentina/dialogs/dialogincrements.cpp b/src/app/valentina/dialogs/dialogincrements.cpp index 355d0aa63..740a52754 100644 --- a/src/app/valentina/dialogs/dialogincrements.cpp +++ b/src/app/valentina/dialogs/dialogincrements.cpp @@ -29,6 +29,9 @@ #include "dialogincrements.h" #include "ui_dialogincrements.h" #include "../vmisc/vvalentinasettings.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../qmuparser/qmudef.h" #include "../qmuparser/qmutokenparser.h" #include "../vpatterndb/vtranslatevars.h" diff --git a/src/app/valentina/dialogs/dialoglayoutprogress.cpp b/src/app/valentina/dialogs/dialoglayoutprogress.cpp index 4350e5eab..65e63c19a 100644 --- a/src/app/valentina/dialogs/dialoglayoutprogress.cpp +++ b/src/app/valentina/dialogs/dialoglayoutprogress.cpp @@ -39,7 +39,9 @@ #include #include +#if __cplusplus >= 201402L using namespace std::chrono_literals; +#endif //--------------------------------------------------------------------------------------------------------------------- DialogLayoutProgress::DialogLayoutProgress(QElapsedTimer timer, qint64 timeout, QWidget *parent) @@ -83,7 +85,11 @@ DialogLayoutProgress::DialogLayoutProgress(QElapsedTimer timer, qint64 timeout, m_progressTimer->stop(); } }); +#if __cplusplus >= 201402L m_progressTimer->start(1s); +#else + m_progressTimer->start(1000); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/dialogs/dialoglayoutsettings.cpp b/src/app/valentina/dialogs/dialoglayoutsettings.cpp index 77b894a87..b6eb32328 100644 --- a/src/app/valentina/dialogs/dialoglayoutsettings.cpp +++ b/src/app/valentina/dialogs/dialoglayoutsettings.cpp @@ -30,6 +30,9 @@ #include "ui_dialoglayoutsettings.h" #include "../vmisc/vvalentinasettings.h" #include "../vmisc/vabstractvalapplication.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vlayout/vlayoutgenerator.h" #include diff --git a/src/app/valentina/dialogs/dialogpatternproperties.cpp b/src/app/valentina/dialogs/dialogpatternproperties.cpp index 3beb4d0cb..3ff887012 100644 --- a/src/app/valentina/dialogs/dialogpatternproperties.cpp +++ b/src/app/valentina/dialogs/dialogpatternproperties.cpp @@ -46,6 +46,9 @@ #include "../vpatterndb/vcontainer.h" #include "../core/vapplication.h" #include "../vmisc/vvalentinasettings.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../qmuparser/qmudef.h" #include "../ifc/xml/vpatternimage.h" #include "../ifc/xml/utils.h" diff --git a/src/app/valentina/dialogs/dialogsavelayout.cpp b/src/app/valentina/dialogs/dialogsavelayout.cpp index feb67ebda..c6cc22678 100644 --- a/src/app/valentina/dialogs/dialogsavelayout.cpp +++ b/src/app/valentina/dialogs/dialogsavelayout.cpp @@ -30,6 +30,9 @@ #include "ui_dialogsavelayout.h" #include "../core/vapplication.h" #include "../vmisc/vvalentinasettings.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../ifc/exception/vexception.h" #include "../vlayout/vlayoutexporter.h" diff --git a/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp b/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp index 34d214d68..442ad7140 100644 --- a/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp +++ b/src/app/valentina/dialogs/vwidgetbackgroundimages.cpp @@ -43,6 +43,9 @@ #include "../vtools/undocommands/image/resetbackgroundimage.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/lambdaconstants.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/app/valentina/dialogs/vwidgetdetails.cpp b/src/app/valentina/dialogs/vwidgetdetails.cpp index 2f7f5bc63..8b6234522 100644 --- a/src/app/valentina/dialogs/vwidgetdetails.cpp +++ b/src/app/valentina/dialogs/vwidgetdetails.cpp @@ -39,7 +39,9 @@ #include #include +#if __cplusplus >= 201402L using namespace std::chrono_literals; +#endif namespace { @@ -91,7 +93,11 @@ void VWidgetDetails::UpdateList() // The filling table is a very expensive operation. This optimization will postpone it. // Each time a new request happen we will wait 800 ms before calling it. If at this time a new request will arrive // we will wait 800 ms more. And so on, until nothing happens within 800ms. +#if __cplusplus >= 201402L m_updateListTimer->start(800ms); +#else + m_updateListTimer->start(800); +#endif } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/app/valentina/mainwindow.cpp b/src/app/valentina/mainwindow.cpp index 3dcd10f52..8e7b76c73 100644 --- a/src/app/valentina/mainwindow.cpp +++ b/src/app/valentina/mainwindow.cpp @@ -214,7 +214,9 @@ #include #endif //defined(Q_OS_MAC) +#if __cplusplus >= 201402L using namespace std::chrono_literals; +#endif QT_WARNING_PUSH QT_WARNING_DISABLE_CLANG("-Wmissing-prototypes") @@ -469,7 +471,11 @@ MainWindow::MainWindow(QWidget *parent) if (VApplication::IsGUIMode()) { +#if __cplusplus >= 201402L QTimer::singleShot(1s, this, &MainWindow::SetDefaultGUILanguage); +#else + QTimer::singleShot(1000, this, &MainWindow::SetDefaultGUILanguage); +#endif } } @@ -2134,7 +2140,11 @@ void MainWindow::MeasurementsChanged(const QString &path) { m_mChanges = true; m_mChangesAsked = false; +#if __cplusplus >= 201402L m_measurementsSyncTimer->start(1500ms); +#else + m_measurementsSyncTimer->start(1500); +#endif } else { @@ -2144,7 +2154,11 @@ void MainWindow::MeasurementsChanged(const QString &path) { m_mChanges = true; m_mChangesAsked = false; +#if __cplusplus >= 201402L m_measurementsSyncTimer->start(1500ms); +#else + m_measurementsSyncTimer->start(1500); +#endif break; } diff --git a/src/libs/ifc/xml/vabstractpattern.cpp b/src/libs/ifc/xml/vabstractpattern.cpp index a72ddaf93..bcc2aed64 100644 --- a/src/libs/ifc/xml/vabstractpattern.cpp +++ b/src/libs/ifc/xml/vabstractpattern.cpp @@ -247,7 +247,7 @@ QString PrepareGroupTags(QStringList tags) tag = tag.simplified(); } - return ConvertToList(ConvertToSet(tags)).join(','); + return ConvertToStringList(ConvertToSet(tags)).join(','); } //--------------------------------------------------------------------------------------------------------------------- diff --git a/src/libs/qmuparser/make_unique.h b/src/libs/qmuparser/make_unique.h new file mode 100644 index 000000000..6e7b95974 --- /dev/null +++ b/src/libs/qmuparser/make_unique.h @@ -0,0 +1,141 @@ +// Implementation of C++14's make_unique for C++11 compilers. +// +// This has been tested with: +// - MSVC 11.0 (Visual Studio 2012) +// - gcc 4.6.3 +// - Xcode 4.4 (with clang "4.0") +// +// It is based off an implementation proposed by Stephan T. Lavavej for +// inclusion in the C++14 standard: +// http://isocpp.org/files/papers/N3656.txt +// Where appropriate, it borrows the use of MSVC's _VARIADIC_EXPAND_0X macro +// machinery to compensate for lack of variadic templates. +// +// This file injects make_unique into the std namespace, which I acknowledge is +// technically forbidden ([C++11: 17.6.4.2.2.1/1]), but is necessary in order +// to have syntax compatibility with C++14. +// +// I perform compiler version checking for MSVC, gcc, and clang to ensure that +// we don't add make_unique if it is already there (instead, we include +// to get the compiler-provided one). You can override the compiler +// version checking by defining the symbol COMPILER_SUPPORTS_MAKE_UNIQUE. +// +// +// =============================================================================== +// This file is released into the public domain. See LICENCE for more information. +// =============================================================================== + +#pragma once + +// If user hasn't specified COMPILER_SUPPORTS_MAKE_UNIQUE then try to figure out +// based on compiler version if std::make_unique is provided. +#if !defined(COMPILER_SUPPORTS_MAKE_UNIQUE) + #if defined(_MSC_VER) + // std::make_unique was added in MSVC 12.0 + #if _MSC_VER >= 1800 // MSVC 12.0 (Visual Studio 2013) + #define COMPILER_SUPPORTS_MAKE_UNIQUE + #endif + #elif defined(__clang__) + // std::make_unique was added in clang 3.4, but not until Xcode 6. + // Annoyingly, Apple makes the clang version defines match the version + // of Xcode, not the version of clang. + #define CLANG_VERSION (__clang_major__ * 10000 + __clang_minor__ * 100 + __clang_patchlevel__) + #if defined(__APPLE__) && CLANG_VERSION >= 60000 + #define COMPILER_SUPPORTS_MAKE_UNIQUE + #elif !defined(__APPLE__) && CLANG_VERSION >= 30400 + #define COMPILER_SUPPORTS_MAKE_UNIQUE + #endif + #elif defined(__GNUC__) + // std::make_unique was added in gcc 4.9, for standards versions greater + // than -std=c++11. + #define GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) + #if GCC_VERSION >= 40900 && __cplusplus > 201103L + #define COMPILER_SUPPORTS_MAKE_UNIQUE + #endif + #endif +#endif + +#if defined(COMPILER_SUPPORTS_MAKE_UNIQUE) + +// If the compiler supports std::make_unique, then pull in to get it. +#include + +#else + +// Otherwise, the compiler doesn't provide it, so implement it ourselves. + +#include +#include +#include +#include + +namespace std { + +template struct _Unique_if { + typedef unique_ptr<_Ty> _Single_object; +}; + +template struct _Unique_if<_Ty[]> { + typedef unique_ptr<_Ty[]> _Unknown_bound; +}; + +template struct _Unique_if<_Ty[N]> { + typedef void _Known_bound; +}; + +// +// template< class T, class... Args > +// unique_ptr make_unique( Args&&... args); +// + +#if defined(_MSC_VER) && (_MSC_VER < 1800) + +// Macro machinery because MSVC 11.0 doesn't support variadic templates. +// The _VARIADIC_EXPAND_0X stuff is defined in +#define _MAKE_UNIQUE( \ + TEMPLATE_LIST, PADDING_LIST, LIST, COMMA, X1, X2, X3, X4) \ + template inline \ + typename _Unique_if<_Ty>::_Single_object make_unique(LIST(_TYPE_REFREF_ARG)) \ + { \ + return unique_ptr<_Ty>(new _Ty(LIST(_FORWARD_ARG))); \ + } \ + +_VARIADIC_EXPAND_0X(_MAKE_UNIQUE, , , , ) +#undef _MAKE_UNIQUE + +#else // not MSVC 11.0 or earlier + +template + typename _Unique_if<_Ty>::_Single_object + make_unique(Args&&... args) { + return unique_ptr<_Ty>(new _Ty(std::forward(args)...)); + } + +#endif + +// template< class T > +// unique_ptr make_unique( std::size_t size ); + +template + typename _Unique_if<_Ty>::_Unknown_bound + make_unique(size_t n) { + typedef typename remove_extent<_Ty>::type U; + return unique_ptr<_Ty>(new U[n]()); + } + +// template< class T, class... Args > +// /* unspecified */ make_unique( Args&&... args ) = delete; + +// MSVC 11.0 doesn't support deleted functions, so the best we can do +// is simply not define the function. +#if !(defined(_MSC_VER) && (_MSC_VER < 1800)) + +template + typename _Unique_if::_Known_bound + make_unique(Args&&...) = delete; + +#endif + +} // namespace std + +#endif // !COMPILER_SUPPORTS_MAKE_UNIQUE diff --git a/src/libs/qmuparser/qmuparser.pri b/src/libs/qmuparser/qmuparser.pri index 0ba3b5aa5..9dae7d639 100644 --- a/src/libs/qmuparser/qmuparser.pri +++ b/src/libs/qmuparser/qmuparser.pri @@ -33,4 +33,5 @@ HEADERS += \ $$PWD/qmudef.h \ $$PWD/qmuformulabase.h \ $$PWD/qmutokenparser.h \ - $$PWD/qmuparsercallback_p.h + $$PWD/qmuparsercallback_p.h \ + $$PWD/make_unique.h diff --git a/src/libs/qmuparser/qmuparsertoken.h b/src/libs/qmuparser/qmuparsertoken.h index c48a548f4..630878c65 100644 --- a/src/libs/qmuparser/qmuparsertoken.h +++ b/src/libs/qmuparser/qmuparsertoken.h @@ -31,6 +31,7 @@ #include "qmuparsererror.h" #include "qmuparsercallback.h" +#include "make_unique.h" /** @file @brief This file contains the parser token definition. diff --git a/src/libs/vdxf/libdxfrw/drw_interface.h b/src/libs/vdxf/libdxfrw/drw_interface.h index ed2126b97..26c7eb463 100644 --- a/src/libs/vdxf/libdxfrw/drw_interface.h +++ b/src/libs/vdxf/libdxfrw/drw_interface.h @@ -19,6 +19,10 @@ #include "drw_objects.h" #include "drw_header.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) + QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Wsuggest-final-types") QT_WARNING_DISABLE_GCC("-Wsuggest-final-methods") diff --git a/src/libs/vlayout/vposter.cpp b/src/libs/vlayout/vposter.cpp index ec8023e3a..7c2b2b986 100644 --- a/src/libs/vlayout/vposter.cpp +++ b/src/libs/vlayout/vposter.cpp @@ -157,7 +157,11 @@ QVector VPoster::Tile(QGraphicsItem *parent, const PosterData & const VWatermarkData &watermarkData, const QString &watermarkPath) const { QVector data; +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) data.append(Borders(parent, img, sheets)); +#else + data += Borders(parent, img, sheets); +#endif if (watermarkData.opacity > 0) { diff --git a/src/libs/vmisc/compatibility.h b/src/libs/vmisc/compatibility.h index 82efbdb58..192dd7dcd 100644 --- a/src/libs/vmisc/compatibility.h +++ b/src/libs/vmisc/compatibility.h @@ -34,6 +34,10 @@ #include #include +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) + class QPointF; // Contains helpful methods to hide version dependent code. It can be deprecation of method or change in API @@ -104,6 +108,13 @@ inline auto ConvertToList(const C &container) -> QList #endif } +//--------------------------------------------------------------------------------------------------------------------- +template class C> +inline auto ConvertToStringList(const C &container) -> QStringList +{ + return {ConvertToList(container)}; +} + //--------------------------------------------------------------------------------------------------------------------- template class C> inline auto ConvertToSet(const C &container) -> QSet diff --git a/src/libs/vmisc/def.h b/src/libs/vmisc/def.h index fbe8017d5..353622c0f 100644 --- a/src/libs/vmisc/def.h +++ b/src/libs/vmisc/def.h @@ -45,6 +45,9 @@ #include "debugbreak.h" #include "defglobal.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) template class QSharedPointer; diff --git a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h index f42cc0e55..2522c6112 100644 --- a/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h +++ b/src/libs/vpatterndb/floatItemData/vabstractfloatitemdata_p.h @@ -33,6 +33,9 @@ #include #include "../vmisc/defglobal.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") diff --git a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h index b084663a2..d1ed2b6a9 100644 --- a/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h +++ b/src/libs/vpatterndb/floatItemData/vgrainlinedata_p.h @@ -34,6 +34,9 @@ #include "../vmisc/defglobal.h" #include "../vmisc/typedef.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) #include "floatitemdef.h" QT_WARNING_PUSH diff --git a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h index c0879d754..26d913b11 100644 --- a/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h +++ b/src/libs/vpatterndb/floatItemData/vpatternlabeldata_p.h @@ -31,9 +31,13 @@ #include #include +#include #include "../vmisc/typedef.h" #include "../vmisc/defglobal.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) QT_WARNING_PUSH QT_WARNING_DISABLE_GCC("-Weffc++") diff --git a/src/libs/vpatterndb/vpiece.cpp b/src/libs/vpatterndb/vpiece.cpp index 23e6a6a78..aa4f41ead 100644 --- a/src/libs/vpatterndb/vpiece.cpp +++ b/src/libs/vpatterndb/vpiece.cpp @@ -1102,7 +1102,11 @@ VPassmark VPiece::CreatePassmark(const QVector &path, int previousIn const QString infoMsg = tr("Notch for point '%1' in piece '%2' will be disabled. Manual length is less than " "allowed value.") .arg(VPiecePath::NodeName(path, passmarkIndex, data), GetName()); +#if QT_VERSION >= QT_VERSION_CHECK(5, 5, 0) qInfo() << VAbstractValApplication::warningMessageSignature + infoMsg; +#else + qWarning() << VAbstractValApplication::warningMessageSignature + infoMsg; +#endif return VPassmark(); } diff --git a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h index fb6ae3f29..2b2d840cb 100644 --- a/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h +++ b/src/libs/vpropertyexplorer/plugins/vfilepropertyeditor.h @@ -34,6 +34,10 @@ #include "../vpropertyexplorer_global.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) + namespace VPE { diff --git a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp index 35ad66cd2..61d9b488e 100644 --- a/src/libs/vtools/dialogs/support/dialogeditlabel.cpp +++ b/src/libs/vtools/dialogs/support/dialogeditlabel.cpp @@ -29,6 +29,9 @@ #include "dialogeditlabel.h" #include "ui_dialogeditlabel.h" #include "../vmisc/vabstractapplication.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vformat/vlabeltemplate.h" #include "../ifc/xml/vlabeltemplateconverter.h" #include "../ifc/xml/vabstractpattern.h" diff --git a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp index 961a70b47..86568926b 100644 --- a/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogcubicbezierpath.cpp @@ -50,6 +50,9 @@ #include "../ifc/ifcdef.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vmath.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "dialogtool.h" diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp index ec964f84a..d8f22ca26 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyaxis.cpp @@ -54,6 +54,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "../vwidgets/vmaingraphicsscene.h" diff --git a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp index ded7d90ca..0b5c46f0c 100644 --- a/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogflippingbyline.cpp @@ -54,6 +54,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "../vwidgets/vmaingraphicsscene.h" diff --git a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp index 0bacd1820..89e06a050 100644 --- a/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp +++ b/src/libs/vtools/dialogs/tools/dialoglineintersect.cpp @@ -45,8 +45,10 @@ #include "../../visualization/line/vistoollineintersect.h" #include "../ifc/xml/vabstractpattern.h" #include "../vgeometry/vpointf.h" -#include "../vmisc/vabstractapplication.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "dialogtool.h" #include "ui_dialoglineintersect.h" diff --git a/src/libs/vtools/dialogs/tools/dialogmove.cpp b/src/libs/vtools/dialogs/tools/dialogmove.cpp index f081816a0..abc6cb919 100644 --- a/src/libs/vtools/dialogs/tools/dialogmove.cpp +++ b/src/libs/vtools/dialogs/tools/dialogmove.cpp @@ -58,6 +58,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vabstractmainwindow.h" diff --git a/src/libs/vtools/dialogs/tools/dialogrotation.cpp b/src/libs/vtools/dialogs/tools/dialogrotation.cpp index 6e5cc8fee..ba3fd92a7 100644 --- a/src/libs/vtools/dialogs/tools/dialogrotation.cpp +++ b/src/libs/vtools/dialogs/tools/dialogrotation.cpp @@ -58,6 +58,9 @@ #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" #include "../vmisc/compatibility.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vpatterndb/vtranslatevars.h" #include "../vwidgets/vabstractmainwindow.h" diff --git a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp index 28dfb586c..f549beaf5 100644 --- a/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp +++ b/src/libs/vtools/dialogs/tools/dialogsplinepath.cpp @@ -58,6 +58,9 @@ #include "../vgeometry/vsplinepoint.h" #include "../vmisc/vabstractapplication.h" #include "../vmisc/vcommonsettings.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include "../vpatterndb/vcontainer.h" #include "../vwidgets/vabstractmainwindow.h" #include "../vwidgets/vmaingraphicsscene.h" diff --git a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp index ecb6f78e7..e9cc18d71 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialoginsertnode.cpp @@ -29,6 +29,9 @@ #include "dialoginsertnode.h" #include "ui_dialoginsertnode.h" #include "../vpatterndb/vcontainer.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp index 8920bb60a..a17ac7cdf 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpiecepath.cpp @@ -34,6 +34,9 @@ #include "../../../tools/vtoolseamallowance.h" #include "../../support/dialogeditwrongformula.h" #include "../vmisc/vmodifierkey.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp index 597027cfd..dc2deb434 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogpin.cpp @@ -30,6 +30,9 @@ #include "ui_dialogpin.h" #include "visualization/line/vistoolspecialpoint.h" #include "../../../tools/vabstracttool.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) //--------------------------------------------------------------------------------------------------------------------- DialogPin::DialogPin(const VContainer *data, quint32 toolId, QWidget *parent) diff --git a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp index f478f3530..65e546946 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogplacelabel.cpp @@ -33,6 +33,9 @@ #include "../../../tools/vtoolseamallowance.h" #include "../../support/dialogeditwrongformula.h" #include "../vgeometry/vplacelabelitem.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include diff --git a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp index f22c4ca18..0acc9688c 100644 --- a/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp +++ b/src/libs/vtools/dialogs/tools/piece/dialogseamallowance.cpp @@ -53,6 +53,9 @@ #include "dialogpatternmaterials.h" #include "../vmisc/vabstractvalapplication.h" #include "../vmisc/vvalentinasettings.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/libs/vtools/tools/vtoolseamallowance.cpp b/src/libs/vtools/tools/vtoolseamallowance.cpp index 2de6a133b..c0ec5685e 100644 --- a/src/libs/vtools/tools/vtoolseamallowance.cpp +++ b/src/libs/vtools/tools/vtoolseamallowance.cpp @@ -56,6 +56,9 @@ #include "../qmuparser/qmutokenparser.h" #include "../vlayout/vlayoutdef.h" #include "toolsdef.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 7, 0) +#include "../vmisc/backport/qoverload.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 7, 0) #include #include diff --git a/src/libs/vwidgets/vabstractmainwindow.h b/src/libs/vwidgets/vabstractmainwindow.h index 3ca3254a9..ac46a8991 100644 --- a/src/libs/vwidgets/vabstractmainwindow.h +++ b/src/libs/vwidgets/vabstractmainwindow.h @@ -36,6 +36,9 @@ #include #include "../vmisc/defglobal.h" +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +#include "../vmisc/diagnostic.h" +#endif // QT_VERSION < QT_VERSION_CHECK(5, 5, 0) struct VFinalMeasurement; diff --git a/src/test/TranslationsTest/tst_buitinregexp.cpp b/src/test/TranslationsTest/tst_buitinregexp.cpp index 58bfe3659..b37055451 100644 --- a/src/test/TranslationsTest/tst_buitinregexp.cpp +++ b/src/test/TranslationsTest/tst_buitinregexp.cpp @@ -102,7 +102,7 @@ void TST_BuitInRegExp::TestCheckIsNamesUnique_data() } QTest::addColumn("translatedName"); - QTest::addColumn>("originalNames"); + QTest::addColumn("originalNames"); QList keys = names.uniqueKeys(); for (const auto &key : keys) @@ -116,7 +116,7 @@ void TST_BuitInRegExp::TestCheckIsNamesUnique_data() void TST_BuitInRegExp::TestCheckIsNamesUnique() { QFETCH(QString, translatedName); - QFETCH(QList, originalNames); + QFETCH(QStringList, originalNames); if (originalNames.size() > 1) { diff --git a/src/test/TranslationsTest/tst_measurementregexp.cpp b/src/test/TranslationsTest/tst_measurementregexp.cpp index 84f0b7b72..ac2e92e81 100644 --- a/src/test/TranslationsTest/tst_measurementregexp.cpp +++ b/src/test/TranslationsTest/tst_measurementregexp.cpp @@ -131,7 +131,7 @@ void TST_MeasurementRegExp::TestCheckIsNamesUnique_data() } QTest::addColumn("translatedName"); - QTest::addColumn>("originalNames"); + QTest::addColumn("originalNames"); QList keys = names.uniqueKeys(); for (const auto &key : keys) @@ -145,7 +145,7 @@ void TST_MeasurementRegExp::TestCheckIsNamesUnique_data() void TST_MeasurementRegExp::TestCheckIsNamesUnique() { QFETCH(QString, translatedName); - QFETCH(QList, originalNames); + QFETCH(QStringList, originalNames); if (QLocale() == QLocale(QStringLiteral("zh_CN")) || QLocale() == QLocale(QStringLiteral("he_IL"))) { diff --git a/src/test/TranslationsTest/tst_tslocaletranslation.cpp b/src/test/TranslationsTest/tst_tslocaletranslation.cpp index ec646de56..af4f23cdf 100644 --- a/src/test/TranslationsTest/tst_tslocaletranslation.cpp +++ b/src/test/TranslationsTest/tst_tslocaletranslation.cpp @@ -30,6 +30,10 @@ #include +#if QT_VERSION < QT_VERSION_CHECK(5, 5, 0) +Q_DECLARE_METATYPE(Qt::LayoutDirection) +#endif + //--------------------------------------------------------------------------------------------------------------------- TST_TSLocaleTranslation::TST_TSLocaleTranslation(const QString &locale, QObject *parent) : TST_AbstractTranslation(parent),