AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
75df151eaa
qt5base-lts/tests/auto/corelib/tools
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
..
qalgorithms tst_QAlgorithms: fix compilation with C++11 enabled 2013-11-17 09:48:17 +01:00
qarraydata Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qbitarray Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qbytearray Base64: Implement the "base64url" encoding and the stripping of '=' 2013-09-14 03:20:25 +02:00
qbytearraymatcher Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qbytedatabuffer don't erroneously claim that gui support is needed 2013-10-16 17:10:15 +02:00
qcache Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qchar Ensure we don't repeat QTBUG-30931 in Qt5 2013-06-18 13:36:23 +02:00
qcollator QCollator: enable move semantics 2013-11-17 09:47:07 +01:00
qcommandlineparser Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qcontiguouscache Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qcryptographichash Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
qdate Add the RFC2822Date format 2013-07-24 15:02:35 +02:00
qdatetime Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qeasingcurve Avoided zero devision in cube root approximation 2013-07-29 19:29:15 +02:00
qelapsedtimer Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qexplicitlyshareddatapointer Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qfreelist Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qhash QHash/QSet - fix QHash::erase when the hash is shared 2013-08-24 15:36:30 +02:00
qline Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qlinkedlist QLinkedList - extend the auto test. 2013-08-29 08:16:44 +02:00
qlist QList - fix insert with iterator on shared instance 2013-08-24 15:36:30 +02:00
qlocale Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qmap Add first/last accessors to QMap 2013-09-08 16:13:16 +02:00
qmargins Add missing operators QMargins -=,+= (int). 2013-10-15 18:20:37 +02:00
qmessageauthenticationcode tst_qmessageauthenticationcode: Fix warning about character conversion. 2013-06-08 10:29:34 +02:00
qpair Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
qpoint Add static dotProduct methods to the QPoint(F) classes 2013-01-26 00:09:14 +01:00
qpointf Fix QPointF::division autotest 2013-08-19 14:24:28 +02:00
qqueue Whitespace cleanup: remove trailing whitespace 2013-03-16 20:22:50 +01:00
qrect Merge remote-tracking branch 'origin/stable' into dev 2013-01-22 18:40:13 +01:00
qregexp Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qregularexpression QRegularExpression: print a warning if (?J) is used in a pattern 2013-02-12 22:40:21 +01:00
qringbuffer Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qscopedpointer Revert "Implement move-ctor and move-assignment-op for QScopedPointer" 2013-09-05 08:20:19 +02:00
qscopedvaluerollback Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qset Added initializer list constructors for Qt associative containers. 2013-01-24 11:38:54 +01:00
qsharedpointer Add QT_NO_PROCESS guards in tests where they are missing 2013-09-03 08:42:24 +02:00
qsize Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qsizef Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstl Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstring QString: add missing contains(QLatin1String) overload 2013-11-26 17:15:46 +01:00
qstring_no_cast_from_bytearray Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstringbuilder Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstringlist Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstringmatcher Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qstringref New QStringRef methods. 2013-09-11 08:06:21 +02:00
qtextboundaryfinder Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qtime Revert 15da0a5af2. 2013-09-19 14:58:27 +02:00
qtimeline Fixed bug in QTimeLine::setPaused(false) 2013-03-13 14:51:05 +01:00
qtimezone Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qvarlengtharray QVarLengthArray: add squeeze function 2013-01-28 16:52:40 +01:00
qvector QVector - removeLast optimize 2013-03-07 08:37:26 +01:00
tools.pro QCollator: enable move semantics 2013-11-17 09:47:07 +01:00