Frederik Gladhorn 9033977d39 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5		2014-01-20 18:18:59 +01:00
..
cesdkhandler.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
cesdkhandler.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
mingw_make.cpp	Add support for using -isystem in qmake	2014-01-20 02:42:31 +01:00
mingw_make.h	Whitespace cleanup: remove trailing whitespace	2013-03-16 20:22:50 +01:00
msbuild_objectmodel.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
msbuild_objectmodel.h	Use correct toolset version for winphone builds	2013-09-15 16:14:49 +02:00
msvc_nmake.cpp	qmake: fix const correctness	2013-12-10 12:24:59 +01:00
msvc_nmake.h	qmake: fix const correctness	2013-12-10 12:24:59 +01:00
msvc_objectmodel.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-01-20 18:18:59 +01:00
msvc_objectmodel.h	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
msvc_vcproj.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-01-10 18:27:49 +01:00
msvc_vcproj.h	qmake: added WMAppManifest generation for winphone target	2013-09-17 23:09:24 +02:00
msvc_vcxproj.cpp	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
msvc_vcxproj.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00
winmakefile.cpp	expand tabs and related whitespace fixes in *.{cpp,h,qdoc}	2014-01-13 22:46:50 +01:00
winmakefile.h	Update copyright year in Digia's license headers	2013-01-18 09:07:35 +01:00