Frederik Gladhorn e65cd6f379 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629		2013-02-14 14:24:57 +01:00
..
io.pri	Add class QSaveFile.	2013-01-17 17:39:11 +01:00
qabstractfileengine.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qabstractfileengine_p.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qbuffer.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qbuffer.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qdatastream.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qdatastream.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qdatastream_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdataurl.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdataurl_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdebug.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qdebug.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qdir.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdir.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qdir_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdiriterator.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qdiriterator.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qfile.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfile.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qfile_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfiledevice.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfiledevice.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qfiledevice_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfileinfo.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfileinfo.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qfileinfo_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemengine.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemengine_mac.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemengine_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemengine_unix.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-28 11:10:29 +01:00
qfilesystemengine_win.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystementry.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystementry_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemiterator_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemiterator_unix.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemiterator_win.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemmetadata_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qfilesystemwatcher_inotify.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_inotify_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_kqueue.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_kqueue_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_polling.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_polling_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_win.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfilesystemwatcher_win_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfsfileengine.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qfsfileengine_iterator.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfsfileengine_iterator_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qfsfileengine_p.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qfsfileengine_unix.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qfsfileengine_win.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qiodevice.cpp	Update documentation for QIODevice::readData().	2013-02-07 11:47:48 +01:00
qiodevice.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qiodevice_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qipaddress.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qipaddress_p.h	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qnoncontiguousbytedevice.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qnoncontiguousbytedevice_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprocess.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprocess.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qprocess_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qprocess_unix.cpp	Switch to struct timespec everywhere instead of timeval	2013-01-28 07:13:23 +01:00
qprocess_win.cpp	QProcessEnvironment: Permit magic cmd variables	2013-02-08 15:24:13 +01:00
qprocess_wince.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qresource.cpp	Remove overlapping variable names defined in VxWorks headers	2013-02-12 09:40:48 +01:00
qresource.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qresource_iterator.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qresource_iterator_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qresource_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsavefile.cpp	Add class QSaveFile.	2013-01-17 17:39:11 +01:00
qsavefile.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qsavefile_p.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qsettings.cpp	Doc: Fix module name format	2013-01-25 17:27:44 +01:00
qsettings.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qsettings_mac.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsettings_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qsettings_win.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstandardpaths.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstandardpaths.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qstandardpaths_blackberry.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qstandardpaths_mac.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstandardpaths_unix.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qstandardpaths_win.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtemporarydir.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qtemporarydir.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtemporaryfile.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qtemporaryfile.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtemporaryfile_p.h	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qtextstream.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-01-22 18:40:13 +01:00
qtextstream.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qtextstream_p.h	Add class QDebugStateSaver for writing QDebug operators correctly	2013-01-14 23:44:15 +01:00
qtldurl.cpp	QUrl effective TLDs: update table and split into chunks of 64K	2013-02-09 10:12:44 +01:00
qtldurl_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurl.cpp	Merge remote-tracking branch 'origin/stable' into dev	2013-02-14 14:24:57 +01:00
qurl.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qurl_p.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurlidna.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qurlquery.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qurlquery.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qurlrecode.cpp	Change copyrights from Nokia to Digia	2012-09-22 19:20:11 +02:00
qurltlds_p.h	QUrl effective TLDs: update table and split into chunks of 64K	2013-02-09 10:12:44 +01:00
qurltlds_p.h.INFO	QUrl TLD: fix documentation file for "Add QUrl::topLevelDomain() ..."	2011-05-24 12:12:13 +02:00
qwindowspipereader.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwindowspipereader_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qwindowspipewriter.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwindowspipewriter_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00
qwinoverlappedionotifier.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
qwinoverlappedionotifier_p.h	Remove QT_{BEGIN,END}_HEADER macro usage	2013-01-29 01:06:04 +01:00