diff options
| author | Jan Arve Saether <jan-arve.saether@qt.io> | 2016-10-03 15:04:47 +0200 |
|---|---|---|
| committer | Jan Arve Sæther <jan-arve.saether@theqtcompany.com> | 2016-10-04 07:15:17 +0000 |
| commit | 5af8d06e70f968ef84ce6cd38f501dd14df00e61 (patch) | |
| tree | a24176593b5dd974b53ed01792256de529490e15 | |
| parent | e02adc3e685893c53408ca5f701a966a4468672a (diff) | |
Compile with mingw
For dllexport, the signatures has to match. We therefore must add the
missing inline keyword.
This is now similar to how e.g. qsize.h does it.
Change-Id: I4de227c7ae8522d5b36a4d9200953cf364eb03d4
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | src/gui/painting/qcolor.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index db6eb92916..eda1ac89c7 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -67,18 +67,18 @@ public: enum Spec { Invalid, Rgb, Hsv, Cmyk, Hsl }; enum NameFormat { HexRgb, HexArgb }; - QColor() Q_DECL_NOTHROW; + inline QColor() Q_DECL_NOTHROW; QColor(Qt::GlobalColor color) Q_DECL_NOTHROW; - QColor(int r, int g, int b, int a = 255); + inline QColor(int r, int g, int b, int a = 255); QColor(QRgb rgb) Q_DECL_NOTHROW; QColor(QRgba64 rgba64) Q_DECL_NOTHROW; - QColor(const QString& name); + inline QColor(const QString& name); QColor(const char *aname) : QColor(QLatin1String(aname)) {} - QColor(QLatin1String name); + inline QColor(QLatin1String name); QColor(Spec spec) Q_DECL_NOTHROW; #if QT_VERSION < QT_VERSION_CHECK(6,0,0) - QColor(const QColor &color) Q_DECL_NOTHROW; // ### Qt 6: remove all of these, the trivial ones are fine. + inline QColor(const QColor &color) Q_DECL_NOTHROW; // ### Qt 6: remove all of these, the trivial ones are fine. # ifdef Q_COMPILER_RVALUE_REFS QColor(QColor &&other) Q_DECL_NOTHROW : cspec(other.cspec), ct(other.ct) {} QColor &operator=(QColor &&other) Q_DECL_NOTHROW |