Go to file
Frederik Gladhorn 6aa09bbce5 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/plugins/platforms/android/qandroidplatformtheme.h

Change-Id: I541bd3069df3ab54c7942d5f4a9e155e3b6566a0
2014-02-18 14:19:36 +01:00
bin Merge "Merge remote-tracking branch 'origin/release' into stable" into refs/staging/stable 2013-06-15 22:39:25 +02:00
config.tests QNX: Add support for lgmon 2014-02-14 10:51:44 +01:00
dist Merge remote-tracking branch 'origin/stable' into dev 2014-02-12 16:28:07 +01:00
doc Doc: Adding a new page to Qt Creator's external page file. 2014-02-14 12:24:35 +01:00
examples Dynamic GL switch on Windows 2014-02-14 10:51:44 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
qmake Merge remote-tracking branch 'origin/stable' into dev 2014-02-17 11:39:16 +01:00
src Merge remote-tracking branch 'origin/stable' into dev 2014-02-18 14:19:36 +01:00
tests Merge remote-tracking branch 'origin/stable' into dev 2014-02-18 14:19:36 +01:00
tools Dynamic GL switch on Windows 2014-02-14 10:51:44 +01:00
util Introduce QChar::JoiningType enum and QChar::joiningType() method 2014-01-29 23:19:47 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore GitIgnore updates 2013-12-09 17:28:18 +01: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 QNX: Add support for lgmon 2014-02-14 10:51:44 +01:00
configure.bat get rid of syncqt wrapper scripts 2013-05-13 21:54:48 +02:00
header.BSD Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.FDL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
header.LGPL-ONLY Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
INSTALL Doc: Update links in INSTALL file 2014-01-16 20:37:25 +01:00
LGPL_EXCEPTION.txt Change copyrights from Nokia to Digia 2012-09-22 19:20:11 +02:00
LICENSE.FDL Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
LICENSE.GPL Add the LICENSE.GPL file to the module referenced from license headers 2012-05-20 22:41:08 +02:00
LICENSE.LGPL Update copyright year in Digia's license headers 2013-01-18 09:07:35 +01:00
LICENSE.PREVIEW.COMMERCIAL Update LICENSE.PREVIEW.COMMERCIAL license 2013-06-03 20:04:26 +02:00
qtbase.pro QNX: Add support for lgmon 2014-02-14 10:51:44 +01:00
sync.profile generate qfeatures.h at build time 2013-10-29 15:37:58 +01:00