Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
authorMichael Brasser <michael.brasser@nokia.com>
Thu, 13 Aug 2009 04:37:41 +0000 (14:37 +1000)
committerMichael Brasser <michael.brasser@nokia.com>
Thu, 13 Aug 2009 04:37:41 +0000 (14:37 +1000)
commitefe66141d535d1741f302efff9248db726cd66b1
treea495722170c03ab9ee27b9cdc347c13a9d9e61f3
parent89a2087b7ec5e36f7f4dd16d942aa23d2c7a6042
parent07d2ce1e6df9f2b5b9c3263741f9a8f160cdbc80
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui

Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/corelib/kernel/qobject_p.h
25 files changed:
bin/syncqt
configure
doc/src/index.qdoc
doc/src/modules.qdoc
doc/src/topics.qdoc
examples/examples.pro
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicsitem.h
src/gui/graphicsview/qgraphicsitem_p.h
src/gui/graphicsview/qgraphicslayout.h
src/gui/graphicsview/qgraphicslayoutitem.h
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicsscene_p.h
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/graphicsview/qgraphicswidget.h
src/src.pro
tests/auto/auto.pro
tools/configure/configureapp.cpp
tools/linguist/lupdate/lupdate.h
tools/linguist/lupdate/main.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-inc.qdocconf
tools/qdoc3/test/qt.qdocconf