whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Jan Arve Saether 2016-10-03 15:04:47 +02:00 committed by Jan Arve Sæther
parent e02adc3e68
commit 5af8d06e70
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/gui/painting/qcolor.h
View File

@ -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