diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:11 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-06-19 17:50:36 +0200 |
| commit | 8af287965907e785afefaa4dd010834a76f2d0f4 (patch) | |
| tree | 100f98b1876d72821c6fd3b67631e97fd142aa50 /src/quick/items/context2d | |
| parent | 6f2bdb816dc816461cf3888eb732f71904b6a7ab (diff) | |
| parent | ee076afedccbe1d37306a7972051f84eb036d655 (diff) | |
Merge branch 'wip/scenegraphng' into dev
Say hello to Shape.
Change-Id: I1093feee4acc375e62bae1d351db0a7969a536d0
Diffstat (limited to 'src/quick/items/context2d')
| -rw-r--r-- | src/quick/items/context2d/qquickcontext2d.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/quick/items/context2d/qquickcontext2d.cpp b/src/quick/items/context2d/qquickcontext2d.cpp index ebfa6deb6f..9ac7422a39 100644 --- a/src/quick/items/context2d/qquickcontext2d.cpp +++ b/src/quick/items/context2d/qquickcontext2d.cpp @@ -40,6 +40,7 @@ #include "qquickcontext2d_p.h" #include "qquickcontext2dcommandbuffer_p.h" #include "qquickcanvasitem_p.h" +#include <private/qtquickglobal_p.h> #include <private/qquickcontext2dtexture_p.h> #include <private/qquickitem_p.h> #if QT_CONFIG(quick_shadereffect) @@ -136,7 +137,7 @@ Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok); THROW_GENERIC_ERROR("Not a Context2D object"); #define qClamp(val, min, max) qMin(qMax(val, min), max) #define CHECK_RGBA(c) (c == '-' || c == '.' || (c >=0 && c <= 9)) -QColor qt_color_from_string(const QV4::Value &name) +Q_QUICK_PRIVATE_EXPORT QColor qt_color_from_string(const QV4::Value &name) { QByteArray str = name.toQString().toUtf8(); |