diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 16:43:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-08-31 17:02:05 +0200 |
commit | 01335edc94d2961bd4061ed2cb81ebd1151797bf (patch) | |
tree | 54df7d2d0857278198258e4d8a65bf63cb35d91a /src/declarative/particles/qsgcustomparticle.cpp | |
parent | 20c3575fc39004d6a556820543982f4a6ebef0be (diff) |
Fix export symbols for QtDeclarative and QtQuick1.
Fix build on Windows and compiler warnings.
Requires 090ee21eac7257644422e35395194e5fd7fb8efa in qtbase.
Change-Id: Ief8da504ccd3e2c2e78644cc9943d685c4302019
Reviewed-on: http://codereview.qt.nokia.com/3988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/declarative/particles/qsgcustomparticle.cpp')
-rw-r--r-- | src/declarative/particles/qsgcustomparticle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/particles/qsgcustomparticle.cpp b/src/declarative/particles/qsgcustomparticle.cpp index 12d32a27b4..373d050627 100644 --- a/src/declarative/particles/qsgcustomparticle.cpp +++ b/src/declarative/particles/qsgcustomparticle.cpp @@ -281,7 +281,7 @@ void QSGCustomParticle::setSource(const QVariant &var, int index) source.item = qobject_cast<QSGItem *>(obj); if (!source.item || !source.item->isTextureProvider()) { qWarning("ShaderEffect: source uniform [%s] is not assigned a valid texture provider: %s [%s]", - qPrintable(source.name), qPrintable(obj->objectName()), obj->metaObject()->className()); + source.name.constData(), qPrintable(obj->objectName()), obj->metaObject()->className()); return; } |