summaryrefslogtreecommitdiffstats
path: root/src/gui/painting/qgraphicssystemfactory.cpp
diff options
context:
space:
mode:
authorFabien Freling <fabien.freling@nokia.com>2011-02-23 14:08:26 (GMT)
committerFabien Freling <fabien.freling@nokia.com>2011-02-23 15:28:36 (GMT)
commitcf13f99d32df6c42c5d421da41ef35e815fb46ac (patch)
tree9a86876c54ac49c7b633407c8f7a416507ffe658 /src/gui/painting/qgraphicssystemfactory.cpp
parent78c5c1cae5f9e100bfb7388f68208406f0db4b42 (diff)
parent0a24d2d6269d509e775f7da91c8002eddc2dcbd7 (diff)
downloadQt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.zip
Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.gz
Qt-cf13f99d32df6c42c5d421da41ef35e815fb46ac.tar.bz2
Merge remote branch 'mainline/master' into merge_raster
Diffstat (limited to 'src/gui/painting/qgraphicssystemfactory.cpp')
-rw-r--r--src/gui/painting/qgraphicssystemfactory.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/painting/qgraphicssystemfactory.cpp b/src/gui/painting/qgraphicssystemfactory.cpp
index 1416f7c..62a60d7 100644
--- a/src/gui/painting/qgraphicssystemfactory.cpp
+++ b/src/gui/painting/qgraphicssystemfactory.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**