AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
ef25620ac1
qt5base-lts/tests/auto
History
Liang Qi ef25620ac1 Merge remote-tracking branch 'origin/5.7' into 5.8 
Conflicts:
	mkspecs/features/mac/default_pre.prf
	mkspecs/features/qpa/genericunixfontdatabase.prf
	mkspecs/features/uikit/default_post.prf
	mkspecs/features/uikit/resolve_config.prf
	mkspecs/macx-ios-clang/features/default_post.prf
	mkspecs/macx-ios-clang/features/resolve_config.prf
	src/corelib/io/qiodevice.cpp

Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491
2016-10-06 20:12:27 +02:00
..
android Updated license headers 2016-01-21 18:55:18 +00:00
bic/data BIC data files for QtBase for Qt 5.7 2016-10-03 09:38:59 +00:00
cmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
compilerwarnings/data Updated license headers 2016-01-21 18:55:18 +00:00
concurrent Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-25 16:12:11 +02:00
corelib Use extreme values in QMetaType/QSettings test data 2016-10-05 20:31:23 +00:00
dbus Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
gui Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-06 20:12:27 +02:00
guiapplauncher
installed_cmake
network Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-06 20:12:27 +02:00
opengl winrt: Add tests to blacklist 2016-09-07 04:54:28 +00:00
other Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
printsupport Merge remote-tracking branch 'origin/5.6' into 5.7 2016-02-29 12:34:31 +01:00
shared Updated license headers 2016-01-21 18:55:18 +00:00
sql Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
testlib Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
tools remove unnecessary references to $$QMAKE_CFLAGS_DBUS 2016-10-04 20:21:28 +00:00
widgets Merge remote-tracking branch 'origin/5.7' into 5.8 2016-10-06 20:12:27 +02:00
xml Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-29 00:38:01 +02:00
auto.pro Use qtConfig throughout in qtbase 2016-08-19 04:28:05 +00:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00