Frederik Gladhorn ca524e5b70 Merge remote-tracking branch 'origin/5.3' into 5.4 ... Manually included changes from 3a347a4e70 in src/opengl/qgl.cpp. Conflicts: src/opengl/qgl_qpa.cpp src/plugins/platforms/android/androidjnimain.cpp Change-Id: Ic26b58ee587d4884c9d0fba45c5a94b5a45ee929		2014-08-12 13:05:02 +02:00
..
qtmain_win.cpp	Windows: Use WinAPI CommandLineToArgvW() to create argv from command line.	2014-05-15 09:34:19 +02:00
qtmain_winrt.cpp	winrt: Use native threading	2014-06-25 16:34:39 +02:00
winmain.pro	Merge remote-tracking branch 'origin/5.3' into 5.4	2014-08-12 13:05:02 +02:00