AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
28,926 Commits 4 Branches 0 Tags 339 MiB
C++ 84.2%
HTML 5.1%
C 4.2%
CMake 2.9%
Objective-C++ 2%
Other 1%
6370c3aa71
Go to file
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
bin Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
config.tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-16 23:16:25 +02:00
dist Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-28 11:51:35 +02:00
doc Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
examples Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-08 17:15:55 +02:00
lib Purge all fonts 2015-08-18 19:59:14 +00:00
mkspecs findclasslist.pl: namespaces can be exported too 2016-10-13 08:29:02 +00:00
qmake Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
src Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
tests Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-13 15:18:02 +02:00
tools Merge remote-tracking branch 'origin/5.6' into 5.7 2016-09-16 23:16:25 +02:00
util Re-generate QLocale data from CLDR v29 2016-04-08 03:51:18 +00:00
.gitattributes
.gitignore Update gitignore 2016-08-19 10:43:26 +00:00
.qmake.conf Bump version 2016-07-28 13:50:04 +02:00
.tag
configure Merge remote-tracking branch 'origin/5.6' into 5.7 2016-08-29 08:13:40 +02:00
configure.bat Don't compile configure.exe with clang-cl.exe if cl.exe is available 2016-07-21 00:16:04 +00:00
header.BSD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.BSD-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.COMM Add header template for commercial only modules 2015-10-19 10:37:18 +00:00
header.FDL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.FDL-OLD Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.GPL-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL3 Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL3-COMM Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL21 Update copyright headers 2015-02-11 06:49:51 +00:00
header.LGPL-NOGPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
header.LGPL-ONLY Update copyright headers 2015-02-11 06:49:51 +00:00
INSTALL Doc: Update links in INSTALL file 2015-02-16 09:06:41 +00:00
LGPL_EXCEPTION.txt Update copyright headers 2015-02-11 06:49:51 +00:00
LICENSE.FDL
LICENSE.GPL2 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPL3-EXCEPT Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.GPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPL3 Add new license header templates and license files 2016-01-14 20:43:46 +00:00
LICENSE.LGPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPLv21 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.PREVIEW.COMMERCIAL Add new license header templates and license files 2016-01-14 20:43:46 +00:00
qtbase.pro Merge remote-tracking branch 'origin/5.6' into 5.7 2016-10-01 22:15:55 +02:00
sync.profile make a proper header-only module for QtZlib 2015-11-17 20:22:17 +00:00