whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto
History
Liang Qi 6370c3aa71 Merge remote-tracking branch 'origin/5.6' into 5.7 
Also bump minimum required Qt version for Android: Ministro updates.

Conflicts:
	src/android/java/src/org/qtproject/qt5/android/bindings/QtActivityLoader.java
	src/android/java/src/org/qtproject/qt5/android/bindings/QtLoader.java
	src/plugins/platforms/android/androidjnimain.cpp

Change-Id: I966f249bebf92da37bfdeb995ad21b027eb03301
 		2016-10-13 15:18:02 +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 Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
dbus Merge remote-tracking branch 'origin/5.6' into 5.7 2016-06-10 23:27:10 +02:00
gui Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
guiapplauncher Fix path to examples part of tst_GuiAppLauncher 2015-02-13 07:28:15 +00:00
installed_cmake
…
network Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-05 19:33:26 +02:00
opengl Merge remote-tracking branch 'origin/5.6.1' into 5.6 2016-06-02 06:01:25 +02:00
other Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +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.6' into 5.7 2016-09-16 23:16:25 +02:00
testlib Blacklist selftest runSubTest 2016-09-12 12:59:48 +00:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-05 13:57:12 +02:00
widgets Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
xml Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
auto.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-04-04 08:59:18 +02:00
network-settings.h Merge remote-tracking branch 'origin/5.6' into 5.7 2016-05-06 15:36:44 +02:00
qtest-config.h Updated license headers 2016-01-21 18:55:18 +00:00
test.pl Updated license headers 2016-01-21 18:55:18 +00:00