whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/io
History
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
..
largefile Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qabstractfileengine Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qbuffer Make QBuffer::bytesAvailable() work 2013-04-16 19:45:11 +02:00
qdatastream QDateTime - Improve and expose Qt::OffsetFromUtc 2013-08-28 19:08:14 +02:00
qdataurl tst_qdataurl: Remove QT_DISABLE_DEPRECATED_BEFORE=0 2013-04-12 07:19:45 +02:00
qdebug Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
qdir fix QFileSystemEngine::createDirectory race condition 2013-06-14 16:57:57 +02:00
qdiriterator Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qfile Enable qfile tests for platforms without network 2013-11-11 20:13:12 +01:00
qfileinfo WinRT: Fix various test compilations 2013-10-02 12:36:05 +02:00
qfileselector Change platform selectors to match qmake selectors 2013-11-15 06:36:44 +01:00
qfilesystementry Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qfilesystemwatcher Merge remote-tracking branch 'origin/stable' into dev 2013-10-11 16:12:35 +02:00
qiodevice Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qipaddress Make QIPAddress::parseIp6 return the first bad character 2013-07-20 05:08:08 +02:00
qlockfile Add QT_NO_PROCESS guards in tests where they are missing 2013-09-03 08:42:24 +02:00
qloggingcategory Revert "Add tracing to logging framework" 2013-11-07 11:29:30 +01:00
qnodebug Import qlogger framework 2013-09-20 23:45:06 +02:00
qprocess add QProcess::InputChannelMode 2013-09-05 21:17:44 +02:00
qprocess-noapplication Expose QTest::currentAppName() and remove hard-coded argv[0] in tests 2013-09-26 18:45:16 +02:00
qprocessenvironment Fix remaining use of QTEST_NOOP_MAIN 2013-09-02 14:59:02 +02:00
qresourceengine Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
qsavefile Fix temporary directory leak in tst_qsavefile. 2013-10-01 12:28:22 +02:00
qsettings Merge remote-tracking branch 'origin/stable' into dev 2013-10-24 12:48:42 +02:00
qstandardpaths Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qtemporarydir WinRT: Fix various test compilations 2013-10-02 12:36:05 +02:00
qtemporaryfile WinRT: Fix various test compilations 2013-10-02 12:36:05 +02:00
qtextstream Fixed QTextStream "stdin" auto tests 2013-07-30 09:56:40 +02:00
qurl tst_qurl: add test for matches() with empty vs null case 2013-11-05 19:08:08 +01:00
qurlinternal Allow non-character codes in utf8 strings 2013-10-17 09:50:58 +02:00
qurlquery tests: Fix some more old references and links to Nokia 2013-02-01 15:27:37 +01:00
qwinoverlappedionotifier bail out early in QWinOverlappedIoNotifier::waitForNotified 2013-07-05 13:37:22 +02:00
io.pro Enable qfile tests for platforms without network 2013-11-11 20:13:12 +01:00