AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
29daa7645b
qt5base-lts/tests/auto/other/qprocess_and_guieventloop
History
Frederik Gladhorn b6191b16d4 Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/global/global.pri
	src/corelib/global/qcompilerdetection.h
	src/corelib/global/qglobal.h
	src/corelib/tools/qdatetime.cpp
	src/plugins/platforms/xcb/qxcbscreen.h
	src/plugins/platforms/xcb/qxcbwindow.h
	src/widgets/dialogs/qcolordialog.cpp
	src/widgets/dialogs/qcolordialog_p.h
	tools/configure/configureapp.cpp

Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
2015-01-21 11:10:14 +01:00
..
write-read-write Fix assorted MSVC warnings in tests. 2015-01-17 12:06:59 +01:00
qprocess_and_guieventloop.pro QProcess: Handle spurious socket notifications for stdout and stderr 2014-06-12 17:54:11 +02:00
test.pro QProcess: Handle spurious socket notifications for stdout and stderr 2014-06-12 17:54:11 +02:00
tst_qprocess_and_guieventloop.cpp Android: Skip QProcess_and_GuiEventLoop test 2015-01-16 09:27:37 +01:00