qt5base-lts/tests/auto/tools
Liang Qi 790aef362f Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
	.qmake.conf
	configure
	src/corelib/global/qglobal.h
	src/tools/qdoc/node.cpp
	src/tools/qdoc/qdocdatabase.cpp
	tests/auto/corelib/io/qsettings/tst_qsettings.cpp
	tools/configure/configureapp.cpp

Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f
2015-10-23 14:45:03 +02:00
..
moc Merge remote-tracking branch 'origin/5.6' into dev 2015-10-23 14:45:03 +02:00
qdbuscpp2xml Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qdbusxml2cpp Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
qmake Tests: Fix single-character string literals. 2015-10-13 18:14:27 +00:00
qmakelib Tests: Remove CONFIG += parallel_test. 2015-09-05 07:16:50 +00:00
rcc Remove QT_DISABLE_DEPRECATED_BEFORE=0 from tests not using deprecated API. 2015-09-01 16:57:46 +00:00
uic Tests: Always verify whether QTemporaryDir/File creation succeeded. 2015-09-28 15:05:43 +00:00
tools.pro add test for the qmake library 2015-02-25 13:54:33 +00:00