Merge from main stable branch
authorMark Kromis <greybird@mac.com>
Wed, 9 Feb 2011 11:07:43 +0000 (06:07 -0500)
committerMark Kromis <greybird@mac.com>
Wed, 9 Feb 2011 11:07:43 +0000 (06:07 -0500)
commit2d3da0640e78e766856a54d71ae10bdfa2a0bb95
tree1a96e86d45aa2c02799a5fbf72bca0e20aa13115
parent8fbfe804e5a5f537547e90bb01e1fd3f555f4eb9
parenta6c9422dc2103ee439696b24932149c5b08f2db8
Merge from main stable branch
58 files changed:
configure
projects.pro
qmake/generators/mac/pbuilder_pbx.cpp
qmake/generators/metamakefile.cpp
qmake/generators/unix/unixmake2.cpp
qmake/option.cpp
qmake/option.h
qmake/project.cpp
qmake/qmake.pri
src/corelib/arch/qatomic_arm.h
src/corelib/arch/qatomic_macosx.h
src/corelib/concurrent/qtconcurrentiteratekernel.cpp
src/corelib/global/qglobal.cpp
src/corelib/global/qglobal.h
src/corelib/global/qnamespace.h
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qsettings.cpp
src/corelib/io/qsettings_p.h
src/corelib/kernel/qcore_mac_p.h
src/corelib/thread/qthread.cpp
src/gui/dialogs/dialogs.pri
src/gui/egl/qegl_p.h
src/gui/image/qpixmap.h
src/gui/image/qpixmap_mac_p.h
src/gui/image/qpixmapdata_p.h
src/gui/image/qpixmapdatafactory.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_p.h
src/gui/kernel/qdnd_p.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.cpp
src/gui/kernel/qwidget.h
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwindowdefs.h
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qpaintengine.h
src/gui/painting/qpaintengine_raster_p.h
src/gui/painting/qregion.h
src/gui/styles/qcommonstyle.cpp
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontengine_p.h
src/gui/util/qdesktopservices.cpp
src/gui/util/util.pri
src/network/kernel/kernel.pri
src/opengl/qgl.cpp
src/opengl/qgl.h
src/opengl/qgl_p.h
src/opengl/qglpixmapfilter.cpp
src/opengl/qwindowsurface_gl.cpp
src/qbase.pri
src/testlib/qtestcase.cpp
tools/linguist/lrelease/lrelease.pro