Go to file
Frederik Gladhorn 3b5c0bc078 Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
2014-03-24 16:10:15 +01:00
bin automate handling of generated headers some more 2014-02-28 03:17:11 +01:00
config.tests QtPrintSupport - Increase Cups required to 1.4 2014-03-17 13:45:34 +01:00
dist update changelog for QtSql 5.3.0 2014-03-18 09:13:36 +01:00
doc Merge remote-tracking branch 'origin/stable' into dev 2014-03-24 16:10:15 +01:00
examples Save using a window-modal sheet on Mac OS X. 2014-03-20 12:53:31 +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-03-24 16:10:15 +01:00
qmake qmake: add replacement function getenv 2014-03-20 08:35:24 +01:00
src Merge remote-tracking branch 'origin/stable' into dev 2014-03-24 16:10:15 +01:00
tests Merge remote-tracking branch 'origin/stable' into dev 2014-03-24 16:10:15 +01:00
tools Remove definition QT_EDITION 2014-03-13 13:27:46 +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 configure: Disable XCB auto-detection on Mac 2014-03-22 12:56:06 +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 move generation of qconfig.h forwarding headers to qtbase.pro 2014-02-28 03:17:11 +01:00
sync.profile automate handling of generated headers some more 2014-02-28 03:17:11 +01:00