Go to file
Albert Astals Cid 95ffd606f8 Do not disable egl on desktop gl automatically
desktop opengl and egl are not incompatible with eachother, so there
is no need to disable egl when on desktop opengl

Task-number: QTBUG-34949

Change-Id: I757c38674a480910d1cb23853c255eb993e107ff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
2013-11-27 13:14:26 +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 Add PPS configure check 2013-11-23 15:45:35 +01:00
dist Fix formatting in the platform-specific changes part of the ChangeLog 2013-11-26 08:24:44 +01:00
doc Update the list of examples that work on Android. 2013-11-21 11:02:37 +01:00
examples Doc: Fix broken links 2013-11-05 00:29:01 +01:00
lib Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
mkspecs Prepare for printing support. 2013-11-23 15:46:19 +01:00
qmake Merge remote-tracking branch 'origin/release' into stable 2013-11-26 10:51:34 +01:00
src QCocoaFileDialogHelper: Cache directory until delegate has been created 2013-11-27 11:46:28 +01:00
tests Fix test compilation on WinRT 2013-11-26 20:29:09 +01:00
tools do not embed manifests into Qt plugins by default 2013-11-26 11:22:17 +01:00
util Remove empty QAccessible2 header 2013-11-20 15:11:24 +01:00
.gitattributes Update the git-archive export options 2012-09-07 15:39:31 +02:00
.gitignore Long live QCommandLineParser! 2013-08-24 21:33:39 +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 Do not disable egl on desktop gl automatically 2013-11-27 13:14:26 +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 INSTALL: Fix URL of Installing Qt documentation 2013-04-11 16:09:07 +02: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 mkspecs: add qfeatures.pri to installed files 2013-11-19 14:26:23 +01:00
sync.profile generate qfeatures.h at build time 2013-10-29 15:37:58 +01:00