Revert "Merge in 4.7"
authorMark Kromis <greybird@AtomicDeath.local>
Fri, 16 Apr 2010 05:36:18 +0000 (01:36 -0400)
committerMark Kromis <greybird@AtomicDeath.local>
Fri, 16 Apr 2010 05:36:18 +0000 (01:36 -0400)
commitc598a7d31575d37cf934a53a33faf01b5899a3cc
tree85cc9bd4a08e839670494a68eb9a320249922e08
parentc5aec98a1cb2f910450b5b156830d900c4e05ede
Revert "Merge in 4.7"

This reverts commit c5aec98a1cb2f910450b5b156830d900c4e05ede, reversing
changes made to db9bfd3653de23693db67ec5a0534e4d4ac97f7d.
166 files changed:
configure
demos/demos.pro
examples/examples.pro
iPhone.txt [deleted file]
mkspecs/common/iphone-g++.conf [deleted file]
mkspecs/common/iphone.conf [deleted file]
mkspecs/features/iphone/default_post.prf [deleted file]
mkspecs/features/iphone/default_pre.prf [deleted file]
mkspecs/features/iphone/dwarf2.prf [deleted file]
mkspecs/features/iphone/objective_c.prf [deleted file]
mkspecs/features/iphone/ppc.prf [deleted file]
mkspecs/features/iphone/rez.prf [deleted file]
mkspecs/features/iphone/sdk.prf [deleted file]
mkspecs/features/iphone/x86.prf [deleted file]
mkspecs/iphonesimulator-g++42/Info.plist.lib [deleted file]
mkspecs/iphonesimulator-g++42/qmake.conf [deleted file]
mkspecs/iphonesimulator-g++42/qplatformdefs.h [deleted file]
projects.pro
qmake/generators/mac/pbuilder_pbx.cpp
qmake/project.cpp
qmake/qmake.pri
src/3rdparty/phonon/mmf/abstractmediaplayer.cpp
src/3rdparty/phonon/mmf/abstractmediaplayer.h
src/3rdparty/phonon/mmf/videoplayer_dsa.cpp
src/3rdparty/webkit/WebCore/css/mediaControlsQt.css [new file with mode: 0644]
src/corelib/arch/arch.pri
src/corelib/codecs/codecs.pri
src/corelib/concurrent/qtconcurrentiteratekernel.cpp
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/io/qsettings_p.h
src/corelib/kernel/kernel.pri
src/corelib/kernel/qcore_mac_p.h
src/corelib/plugin/plugin.pri
src/corelib/thread/qthread.cpp
src/corelib/thread/thread.pri
src/gui/dialogs/dialogs.pri
src/gui/dialogs/qcolordialog_iphone.mm [deleted file]
src/gui/dialogs/qfiledialog_iphone.mm [deleted file]
src/gui/dialogs/qfontdialog_iphone.mm [deleted file]
src/gui/dialogs/qnspanelproxy_iphone.mm [deleted file]
src/gui/dialogs/qpagesetupdialog_iphone.mm [deleted file]
src/gui/dialogs/qprintdialog_iphone.mm [deleted file]
src/gui/gui.pro
src/gui/image/image.pri
src/gui/image/qpixmap.h
src/gui/image/qpixmap_iphone.mm [deleted file]
src/gui/image/qpixmap_iphone_p.h [deleted file]
src/gui/image/qpixmap_mac_p.h
src/gui/image/qpixmapdatafactory.cpp
src/gui/inputmethod/inputmethod.pri
src/gui/inputmethod/qiphoneinputcontext_mac.cpp [deleted file]
src/gui/inputmethod/qiphoneinputcontext_p.h [deleted file]
src/gui/itemviews/qfileiconprovider.cpp
src/gui/itemviews/qheaderview.cpp
src/gui/kernel/iphone.pri [deleted file]
src/gui/kernel/kernel.pri
src/gui/kernel/qapplication.cpp
src/gui/kernel/qapplication.h
src/gui/kernel/qapplication_iphone.mm [deleted file]
src/gui/kernel/qclipboard_iphone.mm [deleted file]
src/gui/kernel/qcocoaapplication_iphone.mm [deleted file]
src/gui/kernel/qcocoaapplication_iphone_p.h [deleted file]
src/gui/kernel/qcocoaapplicationdelegate_iphone.mm [deleted file]
src/gui/kernel/qcocoaapplicationdelegate_iphone_p.h [deleted file]
src/gui/kernel/qcocoamenuloader_iphone.mm [deleted file]
src/gui/kernel/qcocoamenuloader_iphone_p.h [deleted file]
src/gui/kernel/qcocoapanel_iphone.mm [deleted file]
src/gui/kernel/qcocoapanel_iphone_p.h [deleted file]
src/gui/kernel/qcocoaview_iphone.mm [deleted file]
src/gui/kernel/qcocoaview_iphone_p.h [deleted file]
src/gui/kernel/qcocoawindow_iphone.mm [deleted file]
src/gui/kernel/qcocoawindow_iphone_p.h [deleted file]
src/gui/kernel/qcocoawindowcustomthemeframe_iphone.mm [deleted file]
src/gui/kernel/qcocoawindowcustomthemeframe_iphone_p.h [deleted file]
src/gui/kernel/qcocoawindowdelegate_iphone.mm [deleted file]
src/gui/kernel/qcocoawindowdelegate_iphone_p.h [deleted file]
src/gui/kernel/qcursor_iphone.mm [deleted file]
src/gui/kernel/qdesktopwidget_iphone.mm [deleted file]
src/gui/kernel/qdesktopwidget_iphone_p.h [deleted file]
src/gui/kernel/qdnd_iphone.mm [deleted file]
src/gui/kernel/qdnd_p.h
src/gui/kernel/qeventdispatcher_iphone.mm [deleted file]
src/gui/kernel/qeventdispatcher_iphone_p.h [deleted file]
src/gui/kernel/qgridlayout.cpp
src/gui/kernel/qguiplatformplugin.cpp
src/gui/kernel/qkeymapper_iphone.mm [deleted file]
src/gui/kernel/qmacdefines_iphone.h [deleted file]
src/gui/kernel/qmacgesturerecognizer_iphone.mm [deleted file]
src/gui/kernel/qmacgesturerecognizer_iphone_p.h [deleted file]
src/gui/kernel/qmime_iphone.mm [deleted file]
src/gui/kernel/qmultitouch_iphone.mm [deleted file]
src/gui/kernel/qmultitouch_iphone_p.h [deleted file]
src/gui/kernel/qnsframeview_iphone_p.h [deleted file]
src/gui/kernel/qnsthemeframe_iphone_p.h [deleted file]
src/gui/kernel/qnstitledframe_iphone_p.h [deleted file]
src/gui/kernel/qsoftkeymanager.cpp
src/gui/kernel/qsoftkeymanager_common_p.h
src/gui/kernel/qsoftkeymanager_s60.cpp
src/gui/kernel/qsound_iphone.mm [deleted file]
src/gui/kernel/qt_cocoa_helpers_iphone.mm [deleted file]
src/gui/kernel/qt_cocoa_helpers_iphone_p.h [deleted file]
src/gui/kernel/qt_cocoa_helpers_mac_p.h
src/gui/kernel/qt_iphone.mm [deleted file]
src/gui/kernel/qt_iphone_p.h [deleted file]
src/gui/kernel/qt_mac_p.h
src/gui/kernel/qwidget_iphone.mm [deleted file]
src/gui/kernel/qwidget_p.h
src/gui/kernel/qwindowdefs.h
src/gui/painting/painting.pri
src/gui/painting/qbrush.cpp
src/gui/painting/qcolormap_iphone.cpp [deleted file]
src/gui/painting/qgraphicssystem.cpp
src/gui/painting/qgraphicssystem_iphone.cpp [deleted file]
src/gui/painting/qgraphicssystem_iphone_p.h [deleted file]
src/gui/painting/qpaintdevice_iphone.cpp [deleted file]
src/gui/painting/qpaintengine.h
src/gui/painting/qpaintengine_iphone.cpp [deleted file]
src/gui/painting/qpaintengine_iphone_p.h [deleted file]
src/gui/painting/qpaintengine_raster_p.h
src/gui/painting/qprintengine_iphone.mm [deleted file]
src/gui/painting/qprintengine_iphone_p.h [deleted file]
src/gui/painting/qprinterinfo_iphone.cpp [deleted file]
src/gui/painting/qregion.h
src/gui/painting/qregion_iphone.cpp [deleted file]
src/gui/painting/qwindowsurface_iphone.mm [deleted file]
src/gui/painting/qwindowsurface_iphone_p.h [deleted file]
src/gui/styles/qcommonstyle.cpp
src/gui/styles/styles.pri
src/gui/text/qfont.cpp
src/gui/text/qfont_iphone.mm [deleted file]
src/gui/text/qfontdatabase.cpp
src/gui/text/qfontdatabase_iphone.cpp [deleted file]
src/gui/text/qfontengine_iphone.mm [deleted file]
src/gui/text/qfontengine_p.h
src/gui/text/qfontengine_s60.cpp
src/gui/text/qfontengine_s60_p.h
src/gui/text/text.pri
src/gui/util/qdesktopservices.cpp
src/gui/util/qdesktopservices_iphone.cpp [deleted file]
src/gui/util/qsystemtrayicon_iphone.mm [deleted file]
src/gui/util/util.pri
src/multimedia/audio/qaudioinput_alsa_p.cpp
src/multimedia/audio/qaudiooutput_alsa_p.cpp
src/network/access/access.pri
src/network/access/qnetworkdiskcache.cpp
src/network/access/qnetworkdiskcache_p.h
src/network/kernel/kernel.pri
src/network/kernel/qnetworkproxy_iphone.cpp [deleted file]
src/network/socket/socket.pri
src/opengl/qglshaderprogram.cpp
src/plugins/plugins.pro
src/qbase.pri
src/testlib/qtestcase.cpp
src/tools/bootstrap/bootstrap.pro
tests/auto/qbrush/tst_qbrush.cpp
tests/auto/qgraphicseffect/tst_qgraphicseffect.cpp
tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
tools/tools.pro
translations/designer_fr.ts