whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/corelib/kernel
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
..
qcoreapplication Base tst_QGuiApplication on tst_QCoreApplication to increase GUI ED coverage 2013-10-01 18:00:17 +02:00
qeventdispatcher Don't send posted events from QWindowSystemInterface::sendWindowSystemEvents 2013-09-16 15:22:40 +02:00
qeventloop WinRT: Fix various test compilations 2013-10-02 12:36:05 +02:00
qmath Fix qmath autotest for arm 2013-03-14 19:49:38 +01:00
qmetamethod QMetaMethod and QDBusMetaObject: Give public access to signal methods 2013-09-09 16:21:10 +02:00
qmetaobject Test that QMetaObject::invokeMethod is exception safe 2013-11-05 17:37:05 +01:00
qmetaobjectbuilder don't erroneously claim that gui support is needed 2013-10-16 17:10:15 +02:00
qmetaproperty Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qmetatype WinRT: Fix various test compilations 2013-10-02 12:36:05 +02:00
qmimedata tests: Fix some more old references and links to Nokia 2013-02-01 15:27:37 +01:00
qobject Merge remote-tracking branch 'origin/stable' into dev 2013-11-26 22:35:48 +01:00
qpointer don't erroneously claim that gui support is needed 2013-10-16 17:10:15 +02:00
qsharedmemory Skip unstable autotest 2013-03-12 18:13:37 +01:00
qsignalmapper don't erroneously claim that gui support is needed 2013-10-16 17:10:15 +02:00
qsocketnotifier Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qsystemsemaphore Check existence of QProcess feature before using it on Qt autotests. 2013-01-28 16:06:15 +01:00
qtimer Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
qtranslator tst_qtranslator: Remove QT_DISABLE_DEPRECATED_BEFORE=0 2013-04-12 07:20:05 +02:00
qvariant QVariant: Convert automatically from enum types to integral types. 2013-11-08 16:45:26 +01:00
qwineventnotifier remove qt_windows.h include from qwineventnotifier.h 2013-10-29 19:59:17 +01:00
kernel.pro Merge remote-tracking branch 'origin/stable' into dev 2013-10-24 12:48:42 +02:00