Axel Rasmussen 6d87e3ed40 Rename QPixelFormat enum value to avoid conflict with X.h. ... This commit fixes a potential compile error where pixelformat.h would not compile if X.h from x11proto was included first, since X.h #define's GrayScale as an integer constant. Task-number: QTBUG-40087 Change-Id: I7208a204259c6d3a13b5d0cbc98a76bb54b8b494 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>		2014-07-14 23:03:18 +02:00
..
3rdparty	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
android	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00
angle	Fix ANGLE build with Microsoft Visual Studio "14" CTP	2014-06-20 21:54:54 +02:00
concurrent	Doc: Removed "url" variable from qdocconf files.	2014-07-04 12:12:29 +02:00
corelib	Doc: update QCoreApplication to be clear that we don't support text UI	2014-07-14 21:41:44 +02:00
dbus	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-01 16:25:19 +02:00
gui	Rename QPixelFormat enum value to avoid conflict with X.h.	2014-07-14 23:03:18 +02:00
network	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00
opengl	Unduplicate the implementations of next power of two	2014-06-26 00:47:51 +02:00
openglextensions	purge vestiges of opengl es 1 support	2014-04-04 19:32:21 +02:00
platformheaders	Add missing doc file for cocoa native context	2014-07-09 19:07:16 +02:00
platformsupport	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-10 10:11:11 +02:00
plugins	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00
printsupport	Doc: Removed "url" variable from qdocconf files.	2014-07-04 12:12:29 +02:00
sql	Doc: Removed "url" variable from qdocconf files.	2014-07-04 12:12:29 +02:00
testlib	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-10 10:11:11 +02:00
tools	QDoc: Prevent QDoc from outputting the brief for example pages.	2014-07-14 17:18:19 +02:00
widgets	Fix various issues with qandroidstyle	2014-07-10 16:53:11 +02:00
winmain	winrt: Use native threading	2014-06-25 16:34:39 +02:00
xml	Merge remote-tracking branch 'origin/5.3' into dev	2014-07-14 10:35:51 +02:00
src.pro	Load winsys and gl dynamically in the windows plugin	2014-05-22 22:00:59 +02:00