Go to file
Liang Qi ce9519593a Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
	mkspecs/android-g++/qmake.conf
	qmake/generators/unix/unixmake2.cpp
	src/gui/image/qimage_conversions.cpp

Change-Id: Ib76264b8c2d29a0228438ec02bd97d4b97545be0
2015-03-31 10:03:31 +02:00
bin Fixed license headers 2015-02-17 18:46:09 +00:00
config.tests Introduce icu_dependency.pri 2015-03-20 18:12:04 +00:00
dist Adjust wiki links to the new redirect 2015-03-04 15:36:12 +00:00
doc Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
examples Add OpenGL 4.5 to contextinfo example 2015-03-20 14:06:22 +00:00
lib
mkspecs Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
qmake Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
src Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
tests Merge remote-tracking branch 'origin/5.4' into 5.5 2015-03-31 10:03:31 +02:00
tools configure: take XQMAKESPEC into account when looking for files. 2015-03-26 21:15:22 +00:00
util Re-generate the time zones database from CLDR v.27 2015-03-27 16:40:28 +00:00
.gitattributes
.gitignore
.qmake.conf
.tag
configure don't print "progress bar" when stdout is no tty 2015-03-27 13:29:53 +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
sync.profile