Go to file
Liang Qi fcfd31c9fd Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	qmake/generators/mac/pbuilder_pbx.cpp
	src/corelib/global/qglobal.h

Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
2015-06-01 17:46:58 +02:00
bin fixqt4headers.pl: Improve detection of Qt 5 location. 2015-04-22 10:23:41 +00:00
config.tests Add QMAKE_LIBDIR_EGL only if it exists 2015-05-28 07:18:22 +00: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.4' into 5.5 2015-06-01 17:46:58 +02:00
lib
mkspecs Run license checker in qmake 2015-05-27 10:23:10 +00:00
qmake Merge remote-tracking branch 'origin/5.4' into 5.5 2015-06-01 17:46:58 +02:00
src Merge remote-tracking branch 'origin/5.4' into 5.5 2015-06-01 17:46:58 +02:00
tests Reanimate test gui/kernel/qtouchevent/tst_qtouchevent. 2015-05-29 16:36:48 +00:00
tools configure: Remove COMMERCIAL_VERSION define 2015-05-27 15:28:54 +00:00
util Fix typo when resolving EGL extension. 2015-04-23 11:54:36 +00:00
.gitattributes
.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
configure Fix wording of error message 2015-05-27 15:28:35 +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
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