1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix GCC 4.8 build

Browse Source 
Change-Id: I4994146b359e8e37f6c0fa1b27f03fb9e800fdd5
Fixes: QTBUG-77218
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
This commit is contained in:
Ville Voutilainen 2019-08-05 15:24:16 +03:00
parent f3c816befe
commit 4f116f00fc
4 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gui/painting/qtriangulator_p.h
View File

@ -94,7 +94,7 @@ public:
} }
QVertexIndexVector() = default; QVertexIndexVector() = default;
QVertexIndexVector(const QVertexIndexVector &other) = default; QVertexIndexVector(const QVertexIndexVector &) = default;
inline QVertexIndexVector &operator = (const QVertexIndexVector &other) inline QVertexIndexVector &operator = (const QVertexIndexVector &other)
{ {
if (t == UnsignedInt) if (t == UnsignedInt)

4
src/gui/text/qtextlayout.h
View File

@ -114,8 +114,8 @@ public:
// not ambiguous. Implementation detail that should not be documented. // not ambiguous. Implementation detail that should not be documented.
template<char = 0> template<char = 0>
#endif #endif
QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice) QTextLayout(const QString &textData, const QFont &textFont, const QPaintDevice *paintdevice)
: QTextLayout(text, font, const_cast<QPaintDevice*>(paintdevice)) : QTextLayout(textData, textFont, const_cast<QPaintDevice*>(paintdevice))
{} {}
#else #else
QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr); QTextLayout(const QString &text, const QFont &font, const QPaintDevice *paintdevice = nullptr);

46
src/widgets/styles/qstyleoption.h
View File

@ -118,7 +118,7 @@ public:
QStyleOptionFocusRect(); QStyleOptionFocusRect();
QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionFocusRect(const QStyleOptionFocusRect &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &other) = default; QStyleOptionFocusRect &operator=(const QStyleOptionFocusRect &) = default;
protected: protected:
QStyleOptionFocusRect(int version); QStyleOptionFocusRect(int version);
@ -143,7 +143,7 @@ public:
QStyleOptionFrame(); QStyleOptionFrame();
QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionFrame(const QStyleOptionFrame &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionFrame &operator=(const QStyleOptionFrame &other) = default; QStyleOptionFrame &operator=(const QStyleOptionFrame &) = default;
protected: protected:
QStyleOptionFrame(int version); QStyleOptionFrame(int version);
@ -173,7 +173,7 @@ public:
QStyleOptionTabWidgetFrame(); QStyleOptionTabWidgetFrame();
inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other) inline QStyleOptionTabWidgetFrame(const QStyleOptionTabWidgetFrame &other)
: QStyleOption(Version, Type) { *this = other; } : QStyleOption(Version, Type) { *this = other; }
QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &other) = default; QStyleOptionTabWidgetFrame &operator=(const QStyleOptionTabWidgetFrame &) = default;
protected: protected:
QStyleOptionTabWidgetFrame(int version); QStyleOptionTabWidgetFrame(int version);
@ -197,7 +197,7 @@ public:
QStyleOptionTabBarBase(); QStyleOptionTabBarBase();
QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionTabBarBase(const QStyleOptionTabBarBase &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &other) = default; QStyleOptionTabBarBase &operator=(const QStyleOptionTabBarBase &) = default;
protected: protected:
QStyleOptionTabBarBase(int version); QStyleOptionTabBarBase(int version);
@ -229,7 +229,7 @@ public:
QStyleOptionHeader(); QStyleOptionHeader();
QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionHeader(const QStyleOptionHeader &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionHeader &operator=(const QStyleOptionHeader &other) = default; QStyleOptionHeader &operator=(const QStyleOptionHeader &) = default;
protected: protected:
QStyleOptionHeader(int version); QStyleOptionHeader(int version);
@ -252,7 +252,7 @@ public:
QStyleOptionButton(); QStyleOptionButton();
QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionButton(const QStyleOptionButton &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionButton &operator=(const QStyleOptionButton &other) = default; QStyleOptionButton &operator=(const QStyleOptionButton &) = default;
protected: protected:
QStyleOptionButton(int version); QStyleOptionButton(int version);
@ -290,7 +290,7 @@ public:
QStyleOptionTab(); QStyleOptionTab();
QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionTab(const QStyleOptionTab &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionTab &operator=(const QStyleOptionTab &other) = default; QStyleOptionTab &operator=(const QStyleOptionTab &) = default;
protected: protected:
QStyleOptionTab(int version); QStyleOptionTab(int version);
@ -321,7 +321,7 @@ public:
int midLineWidth; int midLineWidth;
QStyleOptionToolBar(); QStyleOptionToolBar();
QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionToolBar(const QStyleOptionToolBar &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionToolBar &operator=(const QStyleOptionToolBar &other) = default; QStyleOptionToolBar &operator=(const QStyleOptionToolBar &) = default;
protected: protected:
QStyleOptionToolBar(int version); QStyleOptionToolBar(int version);
@ -349,7 +349,7 @@ public:
QStyleOptionProgressBar(); QStyleOptionProgressBar();
QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionProgressBar(const QStyleOptionProgressBar &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &other) = default; QStyleOptionProgressBar &operator=(const QStyleOptionProgressBar &) = default;
protected: protected:
QStyleOptionProgressBar(int version); QStyleOptionProgressBar(int version);
@ -380,7 +380,7 @@ public:
QStyleOptionMenuItem(); QStyleOptionMenuItem();
QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionMenuItem(const QStyleOptionMenuItem &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &other) = default; QStyleOptionMenuItem &operator=(const QStyleOptionMenuItem &) = default;
protected: protected:
QStyleOptionMenuItem(int version); QStyleOptionMenuItem(int version);
@ -400,7 +400,7 @@ public:
QStyleOptionDockWidget(); QStyleOptionDockWidget();
QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionDockWidget(const QStyleOptionDockWidget &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &other) = default; QStyleOptionDockWidget &operator=(const QStyleOptionDockWidget &) = default;
protected: protected:
QStyleOptionDockWidget(int version); QStyleOptionDockWidget(int version);
@ -452,7 +452,7 @@ public:
QStyleOptionViewItem(); QStyleOptionViewItem();
QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionViewItem(const QStyleOptionViewItem &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionViewItem &operator=(const QStyleOptionViewItem &other) = default; QStyleOptionViewItem &operator=(const QStyleOptionViewItem &) = default;
protected: protected:
QStyleOptionViewItem(int version); QStyleOptionViewItem(int version);
@ -483,7 +483,7 @@ public:
QStyleOptionToolBox(); QStyleOptionToolBox();
QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionToolBox(const QStyleOptionToolBox &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionToolBox &operator=(const QStyleOptionToolBox &other) = default; QStyleOptionToolBox &operator=(const QStyleOptionToolBox &) = default;
protected: protected:
QStyleOptionToolBox(int version); QStyleOptionToolBox(int version);
@ -503,7 +503,7 @@ public:
QStyleOptionRubberBand(); QStyleOptionRubberBand();
QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionRubberBand(const QStyleOptionRubberBand &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &other) = default; QStyleOptionRubberBand &operator=(const QStyleOptionRubberBand &) = default;
protected: protected:
QStyleOptionRubberBand(int version); QStyleOptionRubberBand(int version);
@ -522,7 +522,7 @@ public:
QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex); QStyleOptionComplex(int version = QStyleOptionComplex::Version, int type = SO_Complex);
QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionComplex(const QStyleOptionComplex &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionComplex &operator=(const QStyleOptionComplex &other) = default; QStyleOptionComplex &operator=(const QStyleOptionComplex &) = default;
}; };
#if QT_CONFIG(slider) #if QT_CONFIG(slider)
@ -547,7 +547,7 @@ public:
QStyleOptionSlider(); QStyleOptionSlider();
QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionSlider(const QStyleOptionSlider &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionSlider &operator=(const QStyleOptionSlider &other) = default; QStyleOptionSlider &operator=(const QStyleOptionSlider &) = default;
protected: protected:
QStyleOptionSlider(int version); QStyleOptionSlider(int version);
@ -567,7 +567,7 @@ public:
QStyleOptionSpinBox(); QStyleOptionSpinBox();
QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionSpinBox(const QStyleOptionSpinBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &other) = default; QStyleOptionSpinBox &operator=(const QStyleOptionSpinBox &) = default;
protected: protected:
QStyleOptionSpinBox(int version); QStyleOptionSpinBox(int version);
@ -595,7 +595,7 @@ public:
QStyleOptionToolButton(); QStyleOptionToolButton();
QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionToolButton(const QStyleOptionToolButton &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionToolButton &operator=(const QStyleOptionToolButton &other) = default; QStyleOptionToolButton &operator=(const QStyleOptionToolButton &) = default;
protected: protected:
QStyleOptionToolButton(int version); QStyleOptionToolButton(int version);
@ -618,7 +618,7 @@ public:
QStyleOptionComboBox(); QStyleOptionComboBox();
QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionComboBox(const QStyleOptionComboBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionComboBox &operator=(const QStyleOptionComboBox &other) = default; QStyleOptionComboBox &operator=(const QStyleOptionComboBox &) = default;
protected: protected:
QStyleOptionComboBox(int version); QStyleOptionComboBox(int version);
@ -637,7 +637,7 @@ public:
QStyleOptionTitleBar(); QStyleOptionTitleBar();
QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionTitleBar(const QStyleOptionTitleBar &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &other) = default; QStyleOptionTitleBar &operator=(const QStyleOptionTitleBar &) = default;
protected: protected:
QStyleOptionTitleBar(int version); QStyleOptionTitleBar(int version);
@ -658,7 +658,7 @@ public:
QStyleOptionGroupBox(); QStyleOptionGroupBox();
QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionGroupBox(const QStyleOptionGroupBox &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &other) = default; QStyleOptionGroupBox &operator=(const QStyleOptionGroupBox &) = default;
protected: protected:
QStyleOptionGroupBox(int version); QStyleOptionGroupBox(int version);
}; };
@ -673,7 +673,7 @@ public:
QStyleOptionSizeGrip(); QStyleOptionSizeGrip();
QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; } QStyleOptionSizeGrip(const QStyleOptionSizeGrip &other) : QStyleOptionComplex(Version, Type) { *this = other; }
QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &other) = default; QStyleOptionSizeGrip &operator=(const QStyleOptionSizeGrip &) = default;
protected: protected:
QStyleOptionSizeGrip(int version); QStyleOptionSizeGrip(int version);
}; };
@ -690,7 +690,7 @@ public:
QStyleOptionGraphicsItem(); QStyleOptionGraphicsItem();
QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; } QStyleOptionGraphicsItem(const QStyleOptionGraphicsItem &other) : QStyleOption(Version, Type) { *this = other; }
QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &other) = default; QStyleOptionGraphicsItem &operator=(const QStyleOptionGraphicsItem &) = default;
static qreal levelOfDetailFromTransform(const QTransform &worldTransform); static qreal levelOfDetailFromTransform(const QTransform &worldTransform);
protected: protected:
QStyleOptionGraphicsItem(int version); QStyleOptionGraphicsItem(int version);

2
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -491,7 +491,7 @@ void tst_QApplication::lastWindowClosed()
QPointer<QDialog> dialog = new QDialog; QPointer<QDialog> dialog = new QDialog;
dialog->setWindowTitle(QLatin1String(QTest::currentTestFunction()) + QLatin1String("Dialog")); dialog->setWindowTitle(QLatin1String(QTest::currentTestFunction()) + QLatin1String("Dialog"));
QVERIFY(dialog->testAttribute(Qt::WA_QuitOnClose)); QVERIFY(dialog->testAttribute(Qt::WA_QuitOnClose));
QTimer::singleShot(1000, dialog, &QDialog::accept); QTimer::singleShot(1000, dialog.data(), &QDialog::accept);
dialog->exec(); dialog->exec();
QVERIFY(dialog); QVERIFY(dialog);
QCOMPARE(spy.count(), 0); QCOMPARE(spy.count(), 0);