summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
authorJoona Petrell <joona.t.petrell@nokia.com>2010-10-20 01:42:32 (GMT)
committerJoona Petrell <joona.t.petrell@nokia.com>2010-10-20 01:42:34 (GMT)
commite3af86a892cd7ce70297f0b1e76390cfd18536e2 (patch)
treeffab2f02e0db96a55280d8b9bf0ac4774edb7d65 /src/declarative
parenta25b49d33f1a4fb3eb9d903f3ce2e7cec08aec43 (diff)
downloadQt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.zip
Qt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.tar.gz
Qt-e3af86a892cd7ce70297f0b1e76390cfd18536e2.tar.bz2
Fix conflict between QDeclarativeGraphics_DerivedObject declared both in qdeclarativeglobal and tst_creation.cpp
Task-number: Reviewed-by: Martin Jones
Diffstat (limited to 'src/declarative')
0 files changed, 0 insertions, 0 deletions