From 8bc72a78b13f2f4c5e1cebebaef9e98b9abbb056 Mon Sep 17 00:00:00 2001 From: Gaurav Kalra Date: Fri, 24 May 2019 17:25:07 +0900 Subject: qtlocation: add PACKAGECONFIGs for geoservices Signed-off-by: Gaurav Kalra Signed-off-by: Martin Jansa --- recipes-qt/qt5/qtlocation_git.bb | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index f4fedf14..6b09db4c 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -17,6 +17,11 @@ PACKAGECONFIG ??= "" # older geoclue 0.12.99 is needed PACKAGECONFIG[geoclue] = ",,geoclue" PACKAGECONFIG[gypsy] = "-feature-gypsy,-no-feature-gypsy,gconf gypsy" +PACKAGECONFIG[geoservices_here] = "-feature-geoservices_here,-no-feature-geoservices_here" +PACKAGECONFIG[geoservices_mapbox] = "-feature-geoservices_mapbox,-no-feature-geoservices_mapbox" +PACKAGECONFIG[geoservices_esri] = "-feature-geoservices_esri,-no-feature-geoservices_esri" +PACKAGECONFIG[geoservices_itemsoverlay] = "-feature-geoservices_itemsoverlay,-no-feature-geoservices_itemsoverlay" +PACKAGECONFIG[geoservices_osm] = "-feature-geoservices_osm,-no-feature-geoservices_osm" PACKAGECONFIG[geoservices_mapboxgl] = "-feature-geoservices_mapboxgl,-no-feature-geoservices_mapboxgl" EXTRA_QMAKEVARS_CONFIGURE += "${PACKAGECONFIG_CONFARGS}" -- cgit v1.2.3 From 2a5f9415e48a38f6f4eb0cf375737a2d8438e2fe Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Thu, 30 May 2019 12:01:42 +0000 Subject: qtbase: fix build with gcc-9 * some components which use Werror started to fail with gcc-9, because of new warning: https://gcc.gnu.org/gcc-9/changes.html New warnings: -Wdeprecated-copy, implied by -Wextra, warns about the C++11 deprecation of implicitly declared copy constructor and assignment operator if one of them is user-provided. -Wdeprecated-copy-dtor also warns if the destructor is user-provided, as specified in C++11. * e.g. maliit-framework-qt5 was now failing with: maliit-framework-qt5/0.99.0+gitAUTOINC+62bd54bcde-r0/recipe-sysroot/usr/include/QtCore/qvariant.h:273:25: error: implicitly-declared 'constexpr QVariant::Private& QVariant::Private::operator=(const QVariant::Private&)' is deprecated [-Werror=deprecated-copy] 273 | { other.d = Private(); } | ^ Signed-off-by: Martin Jansa --- recipes-qt/qt5/nativesdk-qtbase_git.bb | 9 +- recipes-qt/qt5/qtbase-native_git.bb | 11 +- .../qtbase/0017-Always-build-uic-and-qvkgen.patch | 28 -- .../0017-Fix-Wdeprecated-copy-warnings.patch | 371 +++++++++++++++++++++ .../qtbase/0018-Always-build-uic-and-qvkgen.patch | 28 ++ ...18-Avoid-renameeat2-for-native-sdk-builds.patch | 67 ---- ...19-Avoid-renameeat2-for-native-sdk-builds.patch | 67 ++++ .../0019-Bootstrap-without-linkat-feature.patch | 27 -- .../0020-Bootstrap-without-linkat-feature.patch | 27 ++ recipes-qt/qt5/qtbase_git.bb | 3 +- 10 files changed, 506 insertions(+), 132 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch create mode 100644 recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch create mode 100644 recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch delete mode 100644 recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch create mode 100644 recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch delete mode 100644 recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch create mode 100644 recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch (limited to 'recipes-qt') diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 82b6da92..3c4f31cc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb @@ -23,7 +23,7 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/qtbase:" # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -41,14 +41,15 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.7 +# 5.12.meta-qt5-native.8 SRC_URI += " \ - file://0017-Always-build-uic-and-qvkgen.patch \ - file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ " # CMake's toolchain configuration of nativesdk-qtbase diff --git a/recipes-qt/qt5/qtbase-native_git.bb b/recipes-qt/qt5/qtbase-native_git.bb index 91ed4807..715fe6b5 100644 --- a/recipes-qt/qt5/qtbase-native_git.bb +++ b/recipes-qt/qt5/qtbase-native_git.bb @@ -18,7 +18,7 @@ require qt5-git.inc # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -36,19 +36,20 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # common for qtbase-native and nativesdk-qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-native -# 5.12.meta-qt5-native.7 +# 5.12.meta-qt5-native.8 SRC_URI += " \ - file://0017-Always-build-uic-and-qvkgen.patch \ - file://0018-Avoid-renameeat2-for-native-sdk-builds.patch \ + file://0018-Always-build-uic-and-qvkgen.patch \ + file://0019-Avoid-renameeat2-for-native-sdk-builds.patch \ " # only for qtbase-native SRC_URI += " \ - file://0019-Bootstrap-without-linkat-feature.patch \ + file://0020-Bootstrap-without-linkat-feature.patch \ " CLEANBROKEN = "1" diff --git a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch deleted file mode 100644 index 69410925..00000000 --- a/recipes-qt/qt5/qtbase/0017-Always-build-uic-and-qvkgen.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 4b0ca5d85afd944d1e5a3df545ba99566207c184 Mon Sep 17 00:00:00 2001 -From: Martin Jansa -Date: Sat, 16 Nov 2013 00:32:30 +0100 -Subject: [PATCH] Always build uic and qvkgen - -Even if we are not building gui or widgets. This tool is needed later -as a native tool when compiling the target. - -Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 -Signed-off-by: Mikko Levonmaa -Signed-off-by: Martin Jansa ---- - src/src.pro | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/src.pro b/src/src.pro -index 1c76a2e46f..fbd4014fb3 100644 ---- a/src/src.pro -+++ b/src/src.pro -@@ -232,7 +232,7 @@ qtConfig(gui) { - } - } - } --SUBDIRS += src_plugins -+SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen - - nacl: SUBDIRS -= src_network src_testlib - diff --git a/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch new file mode 100644 index 00000000..a5c4bd32 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0017-Fix-Wdeprecated-copy-warnings.patch @@ -0,0 +1,371 @@ +From 3b92a70c05eebc645d83c5570dac0285f612c039 Mon Sep 17 00:00:00 2001 +From: Allan Sandfeld Jensen +Date: Tue, 13 Nov 2018 17:14:43 +0100 +Subject: [PATCH] Fix -Wdeprecated-copy warnings + +Implicit copy constructors or methods are considered deprecated for +classes that has one of the two or a destructor. + +The warning is enabled with -Wextra in gcc 9 + +Change-Id: Ic9be654f2a142fb186a4d5a7d6b4f7d6f4e611d8 +Reviewed-by: Thiago Macieira + +Upstream-Status: Backport from 5.13 + +Signed-off-by: Martin Jansa +--- + mkspecs/features/qt_common.prf | 19 ++++++------------- + src/corelib/io/qprocess_p.h | 3 +-- + src/corelib/kernel/qvariant.h | 5 ++++- + src/corelib/tools/qbytearraylist.h | 2 +- + src/corelib/tools/qlist.h | 6 +++++- + src/corelib/tools/qstringlist.h | 2 +- + src/gui/painting/qtriangulator_p.h | 2 ++ + src/gui/text/qtextobject.h | 1 + + src/widgets/styles/qstyleoption.h | 23 +++++++++++++++++++++++ + 9 files changed, 44 insertions(+), 19 deletions(-) + +diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf +index 6cb2e78c1c..1cf2d45168 100644 +--- a/mkspecs/features/qt_common.prf ++++ b/mkspecs/features/qt_common.prf +@@ -89,14 +89,8 @@ clang { + greaterThan(QT_GCC_MAJOR_VERSION, 5): QMAKE_CXXFLAGS_WARN_ON += -Wshift-overflow=2 -Wduplicated-cond + # GCC 7 has a lot of false positives relating to this, so disable completely + greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-stringop-overflow +- # GCC 9 has a lot of false positives relating to this, so disable completely +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move +- # GCC 9 introduced this ++ # GCC 9 introduced -Wformat-overflow in -Wall, but it is buggy: + greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime + } + + warnings_are_errors:warning_clean { +@@ -136,14 +130,13 @@ warnings_are_errors:warning_clean { + + # GCC 7 includes -Wimplicit-fallthrough in -Wextra, but Qt is not yet free of implicit fallthroughs. + greaterThan(QT_GCC_MAJOR_VERSION, 6): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=implicit-fallthrough +- # GCC 9 has a lot of false positives relating to this, so disable completely +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-deprecated-copy ++ # GCC 9 introduced -Wdeprecated-copy in -Wextra, but we are not clean for it. ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=deprecated-copy + # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-redundant-move ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=redundant-move + # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-format-overflow +- # GCC 9 introduced this +- greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-init-list-lifetime ++ greaterThan(QT_GCC_MAJOR_VERSION, 8): QMAKE_CXXFLAGS_WARN_ON += -Wno-error=init-list-lifetime ++ + # Work-around for bug https://code.google.com/p/android/issues/detail?id=58135 + android: QMAKE_CXXFLAGS_WARN_ON += -Wno-error=literal-suffix + } +diff --git a/src/corelib/io/qprocess_p.h b/src/corelib/io/qprocess_p.h +index aa7ecbe91d..eb2d1ed048 100644 +--- a/src/corelib/io/qprocess_p.h ++++ b/src/corelib/io/qprocess_p.h +@@ -108,8 +108,7 @@ using QProcEnvKey = QByteArray; + class QProcEnvValue + { + public: +- QProcEnvValue() {} +- QProcEnvValue(const QProcEnvValue &other) { *this = other; } ++ QProcEnvValue() = default; + explicit QProcEnvValue(const QString &value) : stringValue(value) {} + explicit QProcEnvValue(const QByteArray &value) : byteValue(value) {} + bool operator==(const QProcEnvValue &other) const +diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h +index ff73c27b6e..2394dc58f8 100644 +--- a/src/corelib/kernel/qvariant.h ++++ b/src/corelib/kernel/qvariant.h +@@ -396,10 +396,13 @@ class Q_CORE_EXPORT QVariant + : type(variantType), is_shared(false), is_null(false) + {} + +- inline Private(const Private &other) Q_DECL_NOTHROW ++#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) ++ Private(const Private &other) Q_DECL_NOTHROW + : data(other.data), type(other.type), + is_shared(other.is_shared), is_null(other.is_null) + {} ++ Private &operator=(const Private &other) Q_DECL_NOTHROW = default; ++#endif + union Data + { + char c; +diff --git a/src/corelib/tools/qbytearraylist.h b/src/corelib/tools/qbytearraylist.h +index ed014dd157..3b5266492f 100644 +--- a/src/corelib/tools/qbytearraylist.h ++++ b/src/corelib/tools/qbytearraylist.h +@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods + { + #ifndef Q_QDOC + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + #endif + public: + inline QByteArray join() const +diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h +index 49ccbc9c9f..1e77b08a15 100644 +--- a/src/corelib/tools/qlist.h ++++ b/src/corelib/tools/qlist.h +@@ -72,7 +72,7 @@ template class QSet; + template struct QListSpecialMethods + { + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + }; + template <> struct QListSpecialMethods; + template <> struct QListSpecialMethods; +@@ -237,6 +237,8 @@ public: + // can't remove it in Qt 5, since doing so would make the type trivial, + // which changes the way it's passed to functions by value. + inline iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i){} ++ inline iterator &operator=(const iterator &o) Q_DECL_NOTHROW ++ { i = o.i; return *this; } + #endif + inline T &operator*() const { return i->t(); } + inline T *operator->() const { return &i->t(); } +@@ -290,6 +292,8 @@ public: + // can't remove it in Qt 5, since doing so would make the type trivial, + // which changes the way it's passed to functions by value. + inline const_iterator(const const_iterator &o) Q_DECL_NOTHROW : i(o.i) {} ++ inline const_iterator &operator=(const const_iterator &o) Q_DECL_NOTHROW ++ { i = o.i; return *this; } + #endif + #ifdef QT_STRICT_ITERATORS + inline explicit const_iterator(const iterator &o) Q_DECL_NOTHROW : i(o.i) {} +diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h +index 10cbad04d6..693cfe30c4 100644 +--- a/src/corelib/tools/qstringlist.h ++++ b/src/corelib/tools/qstringlist.h +@@ -66,7 +66,7 @@ template <> struct QListSpecialMethods + { + #ifndef Q_QDOC + protected: +- ~QListSpecialMethods() {} ++ ~QListSpecialMethods() = default; + #endif + public: + inline void sort(Qt::CaseSensitivity cs = Qt::CaseSensitive); +diff --git a/src/gui/painting/qtriangulator_p.h b/src/gui/painting/qtriangulator_p.h +index 8f043fc925..c9ae2571f4 100644 +--- a/src/gui/painting/qtriangulator_p.h ++++ b/src/gui/painting/qtriangulator_p.h +@@ -93,6 +93,8 @@ public: + return indices16.size(); + } + ++ QVertexIndexVector() = default; ++ QVertexIndexVector(const QVertexIndexVector &other) = default; + inline QVertexIndexVector &operator = (const QVertexIndexVector &other) + { + if (t == UnsignedInt) +diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h +index 067f8473ea..694eb729d5 100644 +--- a/src/gui/text/qtextobject.h ++++ b/src/gui/text/qtextobject.h +@@ -263,6 +263,7 @@ public: + iterator() : p(nullptr), b(0), e(0), n(0) {} + #if QT_VERSION < QT_VERSION_CHECK(6,0,0) + iterator(const iterator &o) : p(o.p), b(o.b), e(o.e), n(o.n) {} ++ iterator &operator=(const iterator &o) = default; + #endif + + QTextFragment fragment() const; +diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h +index 8ae07efc81..763575ff5b 100644 +--- a/src/widgets/styles/qstyleoption.h ++++ b/src/widgets/styles/qstyleoption.h +@@ -118,6 +118,7 @@ public: + + QStyleOptionFocusRect(); + QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &other) = default; + + protected: + QStyleOptionFocusRect(int version); +@@ -142,6 +143,7 @@ public: + + QStyleOptionFrame(); + QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionFrame &operator=(const QStyleOptionFrame &other) = default; + + protected: + QStyleOptionFrame(int version); +@@ -171,6 +173,7 @@ public: + QStyleOptionTabWidgetFrame(); + inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other) + : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &other) = default; + + protected: + QStyleOptionTabWidgetFrame(int version); +@@ -194,6 +197,7 @@ public: + + QStyleOptionTabBarBase(); + QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &other) = default; + + protected: + QStyleOptionTabBarBase(int version); +@@ -225,6 +229,7 @@ public: + + QStyleOptionHeader(); + QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionHeader &operator=(const QStyleOptionHeader &other) = default; + + protected: + QStyleOptionHeader(int version); +@@ -247,6 +252,7 @@ public: + + QStyleOptionButton(); + QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionButton &operator=(const QStyleOptionButton &other) = default; + + protected: + QStyleOptionButton(int version); +@@ -284,6 +290,7 @@ public: + + QStyleOptionTab(); + QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionTab &operator=(const QStyleOptionTab &other) = default; + + protected: + QStyleOptionTab(int version); +@@ -314,6 +321,7 @@ public: + int midLineWidth; + QStyleOptionToolBar(); + QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionToolBar &operator=(const QStyleOptionToolBar &other) = default; + + protected: + QStyleOptionToolBar(int version); +@@ -341,6 +349,7 @@ public: + + QStyleOptionProgressBar(); + QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &other) = default; + + protected: + QStyleOptionProgressBar(int version); +@@ -371,6 +380,7 @@ public: + + QStyleOptionMenuItem(); + QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &other) = default; + + protected: + QStyleOptionMenuItem(int version); +@@ -390,6 +400,7 @@ public: + + QStyleOptionDockWidget(); + QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &other) = default; + + protected: + QStyleOptionDockWidget(int version); +@@ -441,6 +452,7 @@ public: + + QStyleOptionViewItem(); + QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionViewItem &operator=(const QStyleOptionViewItem &other) = default; + + protected: + QStyleOptionViewItem(int version); +@@ -471,6 +483,7 @@ public: + + QStyleOptionToolBox(); + QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionToolBox &operator=(const QStyleOptionToolBox &other) = default; + + protected: + QStyleOptionToolBox(int version); +@@ -490,6 +503,7 @@ public: + + QStyleOptionRubberBand(); + QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &other) = default; + + protected: + QStyleOptionRubberBand(int version); +@@ -508,6 +522,7 @@ public: + + QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex); + QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionComplex &operator=(const QStyleOptionComplex &other) = default; + }; + + #if QT_CONFIG(slider) +@@ -532,6 +547,7 @@ public: + + QStyleOptionSlider(); + QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSlider &operator=(const QStyleOptionSlider &other) = default; + + protected: + QStyleOptionSlider(int version); +@@ -551,6 +567,7 @@ public: + + QStyleOptionSpinBox(); + QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &other) = default; + + protected: + QStyleOptionSpinBox(int version); +@@ -578,6 +595,7 @@ public: + + QStyleOptionToolButton(); + QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionToolButton &operator=(const QStyleOptionToolButton &other) = default; + + protected: + QStyleOptionToolButton(int version); +@@ -600,6 +618,7 @@ public: + + QStyleOptionComboBox(); + QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionComboBox &operator=(const QStyleOptionComboBox &other) = default; + + protected: + QStyleOptionComboBox(int version); +@@ -618,6 +637,7 @@ public: + + QStyleOptionTitleBar(); + QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &other) = default; + + protected: + QStyleOptionTitleBar(int version); +@@ -638,6 +658,7 @@ public: + + QStyleOptionGroupBox(); + QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &other) = default; + protected: + QStyleOptionGroupBox(int version); + }; +@@ -652,6 +673,7 @@ public: + + QStyleOptionSizeGrip(); + QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; } ++ QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &other) = default; + protected: + QStyleOptionSizeGrip(int version); + }; +@@ -668,6 +690,7 @@ public: + + QStyleOptionGraphicsItem(); + QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; } ++ QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &other) = default; + static qreal levelOfDetailFromTransform(const QTransform &worldTransform); + protected: + QStyleOptionGraphicsItem(int version); diff --git a/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch new file mode 100644 index 00000000..7ae15d0a --- /dev/null +++ b/recipes-qt/qt5/qtbase/0018-Always-build-uic-and-qvkgen.patch @@ -0,0 +1,28 @@ +From 0db28cf06f557a714f8cffafbfcdbe68378c8f8a Mon Sep 17 00:00:00 2001 +From: Martin Jansa +Date: Sat, 16 Nov 2013 00:32:30 +0100 +Subject: [PATCH] Always build uic and qvkgen + +Even if we are not building gui or widgets. This tool is needed later +as a native tool when compiling the target. + +Change-Id: I257668ac28c22b192e7ec7736e6c23fa3be6bab6 +Signed-off-by: Mikko Levonmaa +Signed-off-by: Martin Jansa +--- + src/src.pro | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/src.pro b/src/src.pro +index 1c76a2e46f..fbd4014fb3 100644 +--- a/src/src.pro ++++ b/src/src.pro +@@ -232,7 +232,7 @@ qtConfig(gui) { + } + } + } +-SUBDIRS += src_plugins ++SUBDIRS += src_plugins src_tools_uic src_tools_qvkgen + + nacl: SUBDIRS -= src_network src_testlib + diff --git a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch deleted file mode 100644 index 0ca038f5..00000000 --- a/recipes-qt/qt5/qtbase/0018-Avoid-renameeat2-for-native-sdk-builds.patch +++ /dev/null @@ -1,67 +0,0 @@ -From 69aeac9c7233e0d76a8a00b1a45c53c1670c9b49 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= -Date: Sun, 14 Apr 2019 13:27:58 +0200 -Subject: [PATCH] Avoid renameeat2 for native(sdk) builds -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This -causes massive failures at do_install [2] on qtbase. - -To work around tell Qt build configuration not to use ranameet2 independent -of glibc version. - -[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 -[2] https://github.com/meta-qt5/meta-qt5/issues/187 - -Upstream-Status: Inappropriate [OE-specific] - -Signed-off-by: Andreas Müller ---- - src/corelib/global/qconfig-bootstrapped.h | 4 ++-- - src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- - 2 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index dfcc3c9c7f..30166fe41c 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -100,14 +100,14 @@ - #define QT_FEATURE_process -1 - #define QT_FEATURE_regularexpression -1 - #ifdef __GLIBC_PREREQ --# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_renameat2 -1 - #else - # define QT_FEATURE_renameat2 -1 - #endif - #define QT_FEATURE_sharedmemory -1 - #define QT_FEATURE_slog2 -1 - #ifdef __GLIBC_PREREQ --# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) -+# define QT_FEATURE_statx -1 - #else - # define QT_FEATURE_statx -1 - #endif -diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp -index b2d81066db..d1783ebdf3 100644 ---- a/src/corelib/io/qfilesystemengine_unix.cpp -+++ b/src/corelib/io/qfilesystemengine_unix.cpp -@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy - if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) - return emptyFileEntryWarning(), false; - --#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) -- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) -- return true; -- -- // We can also get EINVAL for some non-local filesystems. -- if (errno != EINVAL) { -- error = QSystemError(errno, QSystemError::StandardLibraryError); -- return false; -- } --#endif - #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) - if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) - return true; diff --git a/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch new file mode 100644 index 00000000..b3c2c767 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0019-Avoid-renameeat2-for-native-sdk-builds.patch @@ -0,0 +1,67 @@ +From 0c79a6761e75441f433fd397bc3b79e78b6c5ef8 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andreas=20M=C3=BCller?= +Date: Sun, 14 Apr 2019 13:27:58 +0200 +Subject: [PATCH] Avoid renameeat2 for native(sdk) builds +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Recently pseudo changed to not support reanameeat2 as glibc wrapper [1]. This +causes massive failures at do_install [2] on qtbase. + +To work around tell Qt build configuration not to use ranameet2 independent +of glibc version. + +[1] https://git.openembedded.org/openembedded-core/commit/?id=0fb257121b68f38b40c078150db8f7d0979b7ea5 +[2] https://github.com/meta-qt5/meta-qt5/issues/187 + +Upstream-Status: Inappropriate [OE-specific] + +Signed-off-by: Andreas Müller +--- + src/corelib/global/qconfig-bootstrapped.h | 4 ++-- + src/corelib/io/qfilesystemengine_unix.cpp | 10 ---------- + 2 files changed, 2 insertions(+), 12 deletions(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index dfcc3c9c7f..30166fe41c 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -100,14 +100,14 @@ + #define QT_FEATURE_process -1 + #define QT_FEATURE_regularexpression -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_renameat2 (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_renameat2 -1 + #else + # define QT_FEATURE_renameat2 -1 + #endif + #define QT_FEATURE_sharedmemory -1 + #define QT_FEATURE_slog2 -1 + #ifdef __GLIBC_PREREQ +-# define QT_FEATURE_statx (__GLIBC_PREREQ(2, 28) ? 1 : -1) ++# define QT_FEATURE_statx -1 + #else + # define QT_FEATURE_statx -1 + #endif +diff --git a/src/corelib/io/qfilesystemengine_unix.cpp b/src/corelib/io/qfilesystemengine_unix.cpp +index b2d81066db..d1783ebdf3 100644 +--- a/src/corelib/io/qfilesystemengine_unix.cpp ++++ b/src/corelib/io/qfilesystemengine_unix.cpp +@@ -1248,16 +1248,6 @@ bool QFileSystemEngine::renameFile(const QFileSystemEntry &source, const QFileSy + if (Q_UNLIKELY(srcPath.isEmpty() || tgtPath.isEmpty())) + return emptyFileEntryWarning(), false; + +-#if defined(RENAME_NOREPLACE) && QT_CONFIG(renameat2) +- if (renameat2(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_NOREPLACE) == 0) +- return true; +- +- // We can also get EINVAL for some non-local filesystems. +- if (errno != EINVAL) { +- error = QSystemError(errno, QSystemError::StandardLibraryError); +- return false; +- } +-#endif + #if defined(Q_OS_DARWIN) && defined(RENAME_EXCL) + if (renameatx_np(AT_FDCWD, srcPath, AT_FDCWD, tgtPath, RENAME_EXCL) == 0) + return true; diff --git a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch deleted file mode 100644 index a1d08236..00000000 --- a/recipes-qt/qt5/qtbase/0019-Bootstrap-without-linkat-feature.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 703f89e35aaaec5ad781c222ae2dcd30f31320e9 Mon Sep 17 00:00:00 2001 -From: Samuli Piippo -Date: Fri, 24 Nov 2017 15:16:31 +0200 -Subject: [PATCH] Bootstrap without linkat feature - -qmake does not work together with pseudo when unnamed temporary files -are used with linkat. - -Upstream-Status: Inappropriate [OE specific] -[YOCTO #11996] ---- - src/corelib/global/qconfig-bootstrapped.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h -index 30166fe41c..e06f75541b 100644 ---- a/src/corelib/global/qconfig-bootstrapped.h -+++ b/src/corelib/global/qconfig-bootstrapped.h -@@ -91,7 +91,7 @@ - #define QT_FEATURE_itemmodel -1 - #define QT_FEATURE_library -1 - #ifdef __linux__ --# define QT_FEATURE_linkat 1 -+# define QT_FEATURE_linkat -1 - #else - # define QT_FEATURE_linkat -1 - #endif diff --git a/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch new file mode 100644 index 00000000..e681bfbb --- /dev/null +++ b/recipes-qt/qt5/qtbase/0020-Bootstrap-without-linkat-feature.patch @@ -0,0 +1,27 @@ +From d52010c7d58f1a25f51a909b3179df656ed9d9c4 Mon Sep 17 00:00:00 2001 +From: Samuli Piippo +Date: Fri, 24 Nov 2017 15:16:31 +0200 +Subject: [PATCH] Bootstrap without linkat feature + +qmake does not work together with pseudo when unnamed temporary files +are used with linkat. + +Upstream-Status: Inappropriate [OE specific] +[YOCTO #11996] +--- + src/corelib/global/qconfig-bootstrapped.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/corelib/global/qconfig-bootstrapped.h b/src/corelib/global/qconfig-bootstrapped.h +index 30166fe41c..e06f75541b 100644 +--- a/src/corelib/global/qconfig-bootstrapped.h ++++ b/src/corelib/global/qconfig-bootstrapped.h +@@ -91,7 +91,7 @@ + #define QT_FEATURE_itemmodel -1 + #define QT_FEATURE_library -1 + #ifdef __linux__ +-# define QT_FEATURE_linkat 1 ++# define QT_FEATURE_linkat -1 + #else + # define QT_FEATURE_linkat -1 + #endif diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9183ecf6..c1f6cfba 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -14,7 +14,7 @@ LIC_FILES_CHKSUM = " \ # common for qtbase-native, qtbase-nativesdk and qtbase # Patches from https://github.com/meta-qt5/qtbase/commits/b5.12-shared -# 5.12.meta-qt5-shared.7 +# 5.12.meta-qt5-shared.8 SRC_URI += "\ file://0001-Add-linux-oe-g-platform.patch \ file://0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch \ @@ -32,6 +32,7 @@ SRC_URI += "\ file://0014-Qt5GuiConfigExtras.cmake.in-cope-with-variable-path-.patch \ file://0015-corelib-Include-sys-types.h-for-uint32_t.patch \ file://0016-Define-QMAKE_CXX.COMPILER_MACROS-for-clang-on-linux.patch \ + file://0017-Fix-Wdeprecated-copy-warnings.patch \ " # for syncqt -- cgit v1.2.3