qt5base-lts/tests/auto/qfiledialog
Samuel Rødal d0c48efbae Merge remote branch 'gerrit/master' into refactor
Conflicts:
	src/gui/accessible/qaccessible.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qapplication_mac.mm
	src/gui/kernel/qapplication_qws.cpp
	src/gui/kernel/qapplication_s60.cpp
	src/gui/kernel/qapplication_win.cpp
	src/gui/kernel/qapplication_x11.cpp
	src/gui/kernel/qdnd_x11.cpp
	src/gui/kernel/qwidget.cpp
	src/gui/widgets/qlabel.cpp

Change-Id: Ief9c75724d2cff89ed45f009bdee2ffc5e4395ba
2011-08-29 12:11:53 +02:00
..
resources Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
.gitignore Initial import from the monolithic Qt. 2011-04-27 12:05:43 +02:00
qfiledialog.pro Merge remote branch 'gerrit/master' into refactor 2011-08-29 12:11:53 +02:00
tst_qfiledialog.cpp Merge branch 'master' into refactor 2011-08-25 12:48:52 +02:00