qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
Qt Base (Core, Gui, Widgets, Network, ...)
21,169 Commits 68 Branches 268 Tags 806 MiB
C++ 84.2%
HTML 4.8%
C 3.8%
CMake 3.7%
Objective-C++ 2%
Other 1%
Go to file
Frederik Gladhorn 34aba4724f Merge remote-tracking branch 'origin/5.4' into dev 
Conflicts:
	src/corelib/io/qiodevice.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux.cpp
	src/plugins/bearer/linux_common/qofonoservice_linux_p.h
	src/plugins/platforms/android/qandroidplatformtheme.cpp
	src/tools/bootstrap/bootstrap.pro
	src/widgets/styles/qmacstyle_mac.mm

Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
 		2014-11-24 13:39:13 +01:00
bin
…
config.tests Update license headers and add new license files 2014-09-24 12:26:19 +02:00
dist Merge remote-tracking branch 'origin/5.4.0' into 5.4 2014-11-21 13:44:26 +01:00
doc Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
examples Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
lib
…
mkspecs Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
qmake Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
src Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
tests Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
tools Android: Enable 64-bit configuration on Windows host platform 2014-11-07 11:34:20 +01:00
util Merge remote-tracking branch 'origin/5.4' into dev 2014-09-29 14:08:49 +02:00
.gitattributes
…
.gitignore Remove qtdemo from gitignore 2014-09-17 12:38:55 +02:00
.qmake.conf
…
.tag
…
INSTALL
…
LGPL_EXCEPTION.txt
…
LICENSE.FDL
…
LICENSE.LGPLv3 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
LICENSE.LGPLv21 Update license headers and add new license files 2014-09-24 12:26:19 +02:00
LICENSE.PREVIEW.COMMERCIAL
…
configure Merge remote-tracking branch 'origin/5.4' into dev 2014-11-24 13:39:13 +01:00
configure.bat Update license headers and add new license files 2014-09-24 12:26:19 +02:00
header.BSD
…
header.FDL
…
header.LGPL
…
header.LGPL-ONLY
…
header.LGPL3 Android: Don't include Apache code under LGPLv2 license 2014-10-02 05:59:17 +02:00
header.LGPL21 Added header.LGPL21 2014-08-23 07:17:35 +02:00
qtbase.pro remove nonsensical claim about contains() 2014-11-13 14:33:16 +01:00
sync.profile ANGLE: upgrade to 2.1~07d49ef5350a 2014-08-05 16:43:22 +02:00