J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
unixmake2.cpp	Merge remote-tracking branch 'origin/stable' into dev	2014-06-05 22:26:44 +02:00
unixmake.cpp	Android: Add "unversioned_libname" configuration	2014-04-25 06:34:17 +02:00
unixmake.h	qmake: generate make dist target for subdir projects	2014-06-02 23:27:00 +02:00