Simon Hausmann e281537f20 Merge remote-tracking branch 'origin/5.4' into dev ... Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d		2014-12-18 12:12:58 +01:00
..
configure_pch.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
configure.pro	De-inline QDebug destructor	2014-05-22 08:35:06 +02:00
configureapp.cpp	Merge remote-tracking branch 'origin/5.4' into dev	2014-12-18 12:12:58 +01:00
configureapp.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
environment.cpp	Add detection of and support for Visual Studio 2015	2014-12-13 05:11:25 +01:00
environment.h	Add detection of and support for Visual Studio 2015	2014-12-13 05:11:25 +01:00
main.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
Makefile.mingw	De-inline QDebug destructor	2014-05-22 08:35:06 +02:00
Makefile.win32	Add a way for qmake + configure to link dynamically to the CRT	2014-09-25 22:14:31 +02:00
tools.cpp	Update license headers and add new license files	2014-09-24 12:26:19 +02:00
tools.h	Update license headers and add new license files	2014-09-24 12:26:19 +02:00