From 5eae325fcb4140155fe97ee0dff6101e4a2db444 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Tue, 12 Nov 2019 12:41:24 -0800 Subject: QMake: fix GCC 9 -Wdeprecated-copy warnings Cherry-pick of efa183309e69f317189ef06fb1f13b60da9d7c63. Looks like it was never cherry-picked as intended. Change-Id: Iad959315ad374ef288f5fffd15d684efbcdc6197 Reviewed-by: Ville Voutilainen --- src/linguist/shared/proitems.h | 1 + src/linguist/shared/qmakeparser.h | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linguist/shared/proitems.h b/src/linguist/shared/proitems.h index c7af53b1c..37a25196a 100644 --- a/src/linguist/shared/proitems.h +++ b/src/linguist/shared/proitems.h @@ -67,6 +67,7 @@ class ProString { public: ProString(); ProString(const ProString &other); + ProString &operator=(const ProString &) = default; PROITEM_EXPLICIT ProString(const QString &str); PROITEM_EXPLICIT ProString(const QStringRef &str); PROITEM_EXPLICIT ProString(const char *str); diff --git a/src/linguist/shared/qmakeparser.h b/src/linguist/shared/qmakeparser.h index ae76d8c46..22da3c69f 100644 --- a/src/linguist/shared/qmakeparser.h +++ b/src/linguist/shared/qmakeparser.h @@ -111,7 +111,6 @@ private: struct BlockScope { BlockScope() : start(nullptr), braceLevel(0), special(false), inBranch(false), nest(NestNone) {} - BlockScope(const BlockScope &other) { *this = other; } ushort *start; // Where this block started; store length here int braceLevel; // Nesting of braces in scope bool special; // Single-line conditionals inside loops, etc. cannot have else branches -- cgit v1.2.3