qt5base-lts/tests/auto/tools/uic
Liang Qi ce09ef4313 Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
	src/corelib/io/qprocess_unix.cpp
	src/corelib/io/qprocess_win.cpp
	src/plugins/platforms/android/qandroidplatformintegration.h
	src/plugins/platforms/windows/qwindowscontext.cpp
	src/plugins/platforms/windows/windows.pri
	src/tools/uic/cpp/cppwriteinitialization.cpp
	src/widgets/doc/src/widgets-and-layouts/gallery.qdoc

Change-Id: I8d0834c77f350ea7540140c2c7f372814afc2d0f
2017-06-19 16:12:34 +02:00
..
baseline uic: Fix possible crash when reading the size hint property 2017-06-13 06:56:10 +00:00
.gitignore Moved autotests in category 'tools' into new directory structure 2011-09-12 10:08:29 +02:00
tst_uic.cpp tst_uic: Update version regexp 2017-02-03 12:01:55 +00:00
uic.pro uic-Autotest: Remove SRCDIR-define, add stdout-test. 2012-08-02 20:38:54 +02:00