Merge branch '4.6-stable' of git://gitorious.org/qt/qt into 4.6-iphone
authorMark Kromis <greybird@AtomicDeath.local>
Sun, 11 Apr 2010 07:42:45 +0000 (03:42 -0400)
committerMark Kromis <greybird@AtomicDeath.local>
Sun, 11 Apr 2010 07:42:45 +0000 (03:42 -0400)
commitfd90abdd01323e8bb4c6ccbef44dd312ac4c49ef
tree19f5587886e096532246cef0ee5f33279b2e7832
parente1c6824683de8237727cbc472bb249d85a746132
parent440b48c8601e8a4bb31858c8c5521a0ab8961ef8
Merge branch '4.6-stable' of git://gitorious.org/qt/qt into 4.6-iphone
19 files changed:
configure
examples/examples.pro
qmake/project.cpp
qmake/qmake.pri
src/corelib/corelib.pro
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qnamespace.h
src/corelib/io/qfsfileengine_unix.cpp
src/gui/gui.pro
src/gui/inputmethod/inputmethod.pri
src/gui/kernel/qapplication.cpp
src/gui/kernel/qwidget_p.h
src/gui/styles/styles.pri
src/gui/text/qfont.cpp
src/gui/text/qfontengine_p.h
src/gui/util/util.pri
src/qbase.pri
src/testlib/qtestcase.cpp