Liang Qi b94773c9c8 Merge remote-tracking branch 'origin/5.6' into 5.7 ... Conflicts: config.tests/unix/compile.test src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java src/testlib/qtestcase.cpp src/testlib/qtestcase.qdoc Change-Id: Ied3c471dbc9a076c8de33d673bd557e88575609d		2016-04-13 06:55:37 +02:00
..
images	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
application.pro	Remove warnings about examples not running in the Qt Simulator	2013-10-09 21:45:31 +02:00
application.qrc	Moving .qdoc files under examples/widgets/doc	2012-08-20 12:20:55 +02:00
main.cpp	Unify license header usage.	2016-03-29 10:20:03 +00:00
mainwindow.cpp	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02:00
mainwindow.h	Merge remote-tracking branch 'origin/5.6' into 5.7	2016-04-13 06:55:37 +02:00