qt6-bb10/src/corelib/io
Frederik Gladhorn 4a8273a6fc Merge remote-tracking branch 'origin/stable' into dev
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
2013-11-26 22:35:48 +01:00
..
io.pri Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qabstractfileengine.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qabstractfileengine_p.h Export QAbstractFileEngine[XXXX] classes. 2013-02-27 18:02:50 +01:00
qbuffer.cpp Make QBuffer unbuffered 2013-04-16 19:45:11 +02: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-10-11 16:12:35 +02:00
qdatastream.h Bump Qt version to 5.3.0 2013-09-24 14:01:37 +02:00
qdatastream_p.h
qdataurl.cpp
qdataurl_p.h
qdebug.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qdebug.h Make QFlags enum flags (C++11 strict enums) friendly 2013-05-09 12:17:59 +02:00
qdir.cpp Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qdir.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qdir_p.h
qdiriterator.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qdiriterator.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qfile.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qfile.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qfile_p.h
qfiledevice.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qfiledevice.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qfiledevice_p.h
qfileinfo.cpp Doc: Fix miscellaneous typos 2013-10-30 00:34:34 +01:00
qfileinfo.h Add a static QFileInfo::exists(fileName) function 2013-09-13 19:37:51 +02:00
qfileinfo_p.h Fix memory leak in QFileInfo::exists() 2013-10-12 10:52:03 +02:00
qfileselector.cpp QNX: Fix build 2013-11-20 18:24:14 +01:00
qfileselector.h QFileSelector: mark ctor explicit 2013-11-16 16:39:38 +01:00
qfileselector_p.h Add QFileSelector API 2013-09-16 19:42:22 +02:00
qfilesystemengine.cpp Utilize the new Q_OS_MACX define. 2013-05-09 12:17:59 +02:00
qfilesystemengine_p.h Utilize the new Q_OS_MACX define. 2013-05-09 12:17:59 +02:00
qfilesystemengine_unix.cpp Refactor OS X bundle detection for QFileInfo 2013-10-04 14:37:22 +02:00
qfilesystemengine_win.cpp fix directory separators for WinRT 2013-11-12 12:46:37 +01:00
qfilesystementry.cpp Refactor plugin loading for WinRT 2013-11-05 08:17:35 +01:00
qfilesystementry_p.h
qfilesystemiterator_p.h
qfilesystemiterator_unix.cpp QNX: Make use of _readdir64_r 2013-11-25 18:15:35 +01:00
qfilesystemiterator_win.cpp Added initial file system support for winrt 2013-10-11 12:22:53 +02:00
qfilesystemmetadata_p.h Added initial file system support for winrt 2013-10-11 12:22:53 +02:00
qfilesystemwatcher.cpp
qfilesystemwatcher.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qfilesystemwatcher_inotify.cpp Fix QFileSystemWatcher inotify 2013-09-19 09:13:57 +02:00
qfilesystemwatcher_inotify_p.h Fix QFileSystemWatcher inotify 2013-09-19 09:13:57 +02:00
qfilesystemwatcher_kqueue.cpp
qfilesystemwatcher_kqueue_p.h
qfilesystemwatcher_p.h
qfilesystemwatcher_polling.cpp
qfilesystemwatcher_polling_p.h
qfilesystemwatcher_win.cpp Use case insensitive matching for hashes QFileSystemWatcher/Win. 2013-07-04 12:54:58 +02:00
qfilesystemwatcher_win_p.h Win: Fixed namespaced build with QT_NO_FILESYSTEMWATCHER 2013-09-27 10:15:35 +02:00
qfsfileengine.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qfsfileengine_iterator.cpp
qfsfileengine_iterator_p.h
qfsfileengine_p.h
qfsfileengine_unix.cpp
qfsfileengine_win.cpp Added initial file system support for winrt 2013-10-11 12:22:53 +02:00
qiodevice.cpp Add qWarning when trying to read or write a closed device 2013-10-15 04:29:19 +02:00
qiodevice.h Make sure that we #include qconfig.h before testing for features. 2013-03-19 07:02:57 +01:00
qiodevice_p.h
qipaddress.cpp Make QIPAddress::parseIp6 return the first bad character 2013-07-20 05:08:08 +02:00
qipaddress_p.h Make QIPAddress::parseIp6 return the first bad character 2013-07-20 05:08:08 +02:00
qlockfile.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qlockfile.h Remove QT_{BEGIN,END}_HEADERS macros 2013-04-10 12:53:05 +02:00
qlockfile_p.h Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qlockfile_unix.cpp Include unistd.h in the unix implementation source of QLockFile 2013-10-31 12:33:55 +01:00
qlockfile_win.cpp Added initial file system support for winrt 2013-10-11 12:22:53 +02:00
qloggingcategory.cpp Prevent clang from warning about unused variables 2013-11-08 16:45:26 +01:00
qloggingcategory.h Revert "Add tracing to logging framework" 2013-11-07 11:29:30 +01:00
qloggingcategory_p.h Import qlogger framework 2013-09-20 23:45:06 +02:00
qloggingregistry.cpp Revert "Add tracing to logging framework" 2013-11-07 11:29:30 +01:00
qloggingregistry_p.h Import qlogger framework 2013-09-20 23:45:06 +02:00
qnoncontiguousbytedevice.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qnoncontiguousbytedevice_p.h
qprocess.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qprocess.h add QProcess::InputChannelMode 2013-09-05 21:17:44 +02:00
qprocess_p.h add QProcess::InputChannelMode 2013-09-05 21:17:44 +02:00
qprocess_unix.cpp Fix a crash in QProcess signal handling on Mac. 2013-09-25 09:21:54 +02:00
qprocess_win.cpp QProcess/Win: fix crash in drainOutputPipes 2013-10-02 10:45:27 +02:00
qprocess_wince.cpp Fixed WINCE linking error in QProcess 2013-05-14 15:18:50 +02:00
qresource.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qresource.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qresource_iterator.cpp
qresource_iterator_p.h
qresource_p.h Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
qsavefile.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qsavefile.h Make qtbase compile with QT_NO_TEMPORARYFILE 2013-06-04 00:05:55 +02:00
qsavefile_p.h Make qtbase compile with QT_NO_TEMPORARYFILE 2013-06-04 00:05:55 +02:00
qsettings.cpp Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qsettings.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qsettings_mac.cpp Replace deprecated method 2013-11-22 21:35:29 +01:00
qsettings_p.h
qsettings_win.cpp Allow to use short names for Windows Registry root keys 2013-10-07 19:09:37 +02:00
qstandardpaths.cpp Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qstandardpaths.h QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_blackberry.cpp QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_ios.mm QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_mac.cpp QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_unix.cpp QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_win.cpp QStandardPaths: add GenericConfigLocation 2013-11-05 19:08:08 +01:00
qstandardpaths_winrt.cpp WinRT: implement QStandardPaths 2013-11-12 12:46:37 +01:00
qtemporarydir.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qtemporarydir.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qtemporaryfile.cpp Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev 2013-10-14 11:35:30 +02:00
qtemporaryfile.h Long live QLockFile 2013-03-05 06:26:33 +01:00
qtemporaryfile_p.h Make qtbase compile with QT_NO_TEMPORARYFILE 2013-06-04 00:05:55 +02:00
qtextstream.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qtextstream.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qtextstream_p.h
qtldurl.cpp QUrl effective TLDs: update table and split into chunks of 64K 2013-02-09 10:12:44 +01:00
qtldurl_p.h
qurl.cpp Silence compiler warning 2013-11-04 19:53:08 +01:00
qurl.h QUrlTwoFlag: add two missing constexpr 2013-11-07 03:06:16 +01:00
qurl_mac.mm Add Mac type conversion functions to QtCore 2013-09-21 05:09:41 +02:00
qurl_p.h Fix QUrl::topLevelDomain(QUrl::FullyDecoded) 2013-07-06 09:42:27 +02:00
qurlidna.cpp Fix WinCE/MSVC2008 build errors related to std::lower_bound patches. 2013-09-25 17:22:52 +02:00
qurlquery.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qurlquery.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qurlrecode.cpp Initialize variable to fix build [-Werror=uninitialized]. 2013-10-19 23:48:44 +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
qwindowspipereader.cpp Doc: Adding mark-up to boolean default values. 2013-10-08 00:46:27 +02:00
qwindowspipereader_p.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qwindowspipewriter.cpp
qwindowspipewriter_p.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00
qwinoverlappedionotifier.cpp QWinOverlappedIoNotifier: fix race condition 2013-07-05 13:37:22 +02:00
qwinoverlappedionotifier_p.h Remove QT_{BEGIN,END}_HEADER macro usage 2013-01-29 01:06:04 +01:00