Merge git://gitorious.org/qt/qt into 4.8
authorIan Dean <ian@mediator-software.com>
Fri, 22 Feb 2013 11:01:25 +0000 (13:01 +0200)
committerIan Dean <ian@mediator-software.com>
Fri, 22 Feb 2013 11:01:25 +0000 (13:01 +0200)
commit4deb7f7ca55afaff57a2d50f8ded5bb7fc7f2384
tree14e5cc43faa0e595ca48715a1c960ce947bc47e2
parent607c6fa52c670118fd10e39f54c45fb20b0b2ca3
parente3cc56d532edc97291b4f5a6c95db8b0ed8b3fe8
Merge git://gitorious.org/qt/qt into 4.8
44 files changed:
configure
demos/glhypnotizer/main.cpp
demos/spectrum/app/main.cpp
demos/spectrum/app/mainwidget.cpp
demos/textedit/main.cpp
examples/animation/animatedtiles/main.cpp
examples/mainwindows/application/main.cpp
examples/multimedia/audiodevices/main.cpp
examples/multimedia/audioinput/audioinput.cpp
examples/multimedia/audioinput/main.cpp
examples/multimedia/audiooutput/audiooutput.cpp
examples/multimedia/audiooutput/main.cpp
examples/webkit/fancybrowser/main.cpp
examples/webkit/fancybrowser/mainwindow.cpp
examples/widgets/scribble/main.cpp
mkspecs/common/ios/qplatformdefs.h
qmake/generators/mac/pbuilder_pbx.cpp
src/corelib/arch/qatomic_armv6.h
src/corelib/io/qfilesystemengine_unix.cpp
src/gui/kernel/qapplication_qpa.cpp
src/gui/kernel/qplatformglcontext_qpa.h
src/gui/kernel/qplatformnativeinterface_qpa.cpp
src/gui/kernel/qplatformnativeinterface_qpa.h
src/gui/kernel/qsound_mac.mm
src/gui/kernel/qwidget.cpp
src/gui/styles/qcommonstyle.cpp
src/gui/text/qfontengine_coretext_p.h
src/gui/util/qdesktopservices.cpp
src/multimedia/audio/qaudio_mac_p.h
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp
src/multimedia/audio/qaudiodeviceinfo_mac_p.h
src/multimedia/audio/qaudioinput_mac_p.cpp
src/multimedia/audio/qaudioinput_mac_p.h
src/multimedia/audio/qaudiooutput_mac_p.cpp
src/multimedia/audio/qaudiooutput_mac_p.h
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl.h
src/opengl/qgl_qpa.cpp
src/opengl/qglframebufferobject.cpp
src/opengl/qglfunctions.h
src/opengl/qglpaintdevice.cpp
src/opengl/qwindowsurface_gl.cpp
tools/qml/main.cpp
tools/qml/qmlruntime.cpp