Merge 4.7 updates
authorMark Kromis <greybird@mac.com>
Tue, 6 Jul 2010 11:05:30 +0000 (07:05 -0400)
committerMark Kromis <greybird@mac.com>
Tue, 6 Jul 2010 11:07:24 +0000 (07:07 -0400)
commitb7f64e3a02eec6e8203c0147333b519c2996748e
tree20ed79d005931aeabb908f1039b5086b6fcd24ae
parent3304b8db0bc9e8664fa0805ffc01d66551b339f5
parent76aad35bd9f699c966295738095d245a5e7a6457
Merge 4.7 updates
45 files changed:
configure
demos/demos.pro
examples/examples.pro
projects.pro
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/metamakefile.cpp
qmake/option.h
qmake/project.cpp
qmake/qmake.pri
src/corelib/codecs/codecs.pri
src/corelib/corelib.pro
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qnamespace.h
src/corelib/io/io.pri
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qsettings.cpp
src/corelib/thread/qthread.cpp
src/gui/gui.pro
src/gui/image/image.pri
src/gui/image/qpixmap.h
src/gui/image/qpixmapdatafactory.cpp
src/gui/kernel/kernel.pri
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qguiplatformplugin.cpp
src/gui/kernel/qt_cocoa_helpers_mac_p.h
src/gui/kernel/qt_mac_p.h
src/gui/kernel/qwidget_p.h
src/gui/painting/painting.pri
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/styles/qcommonstyle.cpp
src/gui/styles/styles.pri
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontengine_p.h
src/gui/text/text.pri
src/gui/util/util.pri
src/plugins/plugins.pro
src/qbase.pri
src/tools/bootstrap/bootstrap.pri
src/tools/bootstrap/bootstrap.pro
tools/tools.pro