AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
23,859 Commits 4 Branches 0 Tags 339 MiB
C++ 84.2%
HTML 5.1%
C 4.2%
CMake 2.9%
Objective-C++ 2%
Other 1%
e2f66f9215
Go to file
Simon Hausmann e2f66f9215 Merge remote-tracking branch 'origin/5.5' into dev 
Conflicts:
	src/corelib/global/qnamespace.qdoc
	src/corelib/io/qwindowspipereader.cpp
	src/corelib/io/qwindowspipereader_p.h
	src/corelib/statemachine/qstatemachine.cpp
	src/corelib/statemachine/qstatemachine_p.h
	src/plugins/platforms/xcb/qxcbconnection.h
	tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
	tests/auto/tools/qmake/tst_qmake.cpp
	tests/manual/touch/main.cpp

Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
2015-06-03 10:23:56 +02:00
bin fixqt4headers.pl: Improve detection of Qt 5 location. 2015-04-22 10:23:41 +00:00
config.tests Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
dist Revert some changes in light of GCC 4 -fPIE reversal 2015-05-29 00:08:41 +00:00
doc Doc: Added the Qt Multimedia backends wiki link 2015-05-13 11:55:07 +00:00
examples Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
qmake Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
src Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
tests Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
tools Merge remote-tracking branch 'origin/5.5' into dev 2015-06-03 10:23:56 +02:00
util Fix typo when resolving EGL extension. 2015-04-23 11:54:36 +00:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Remove qtdemo from gitignore 2014-09-17 12:38:55 +02:00
.qmake.conf Enable -Werror for all of qtbase 2013-09-04 01:50:10 +02:00
.tag Update the git-archive export options 2012-09-07 15:39:31 +02:00
configure xcb: Use XIGrabDevice instead of xcb_grab_pointer with XI 2.2 2015-06-01 06:34:22 +00:00
configure.bat support spaces in build and install dirs 2015-02-17 18:28:00 +00:00
header.BSD Updated BSD licensed file headers 2015-02-15 07:41:17 +00:00
header.FDL Update copyright headers 2015-02-11 06:49:51 +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-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 Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.LGPLv3 Update copyright headers 2015-02-11 06:49:51 +00:00
LICENSE.LGPLv21 Update copyright headers 2015-02-11 06:49:51 +00:00
LICENSE.PREVIEW.COMMERCIAL Update copyright headers 2015-02-11 06:49:51 +00:00
qtbase.pro Run license checker in qmake 2015-05-27 10:23:10 +00:00
sync.profile ANGLE: upgrade to 2.1~07d49ef5350a 2014-08-05 16:43:22 +02:00