5c23199d4e
Conflicts: configure mkspecs/macx-xcode/Info.plist.app mkspecs/macx-xcode/Info.plist.lib qmake/doc/qmake.qdocconf src/corelib/global/qglobal.h tests/auto/other/exceptionsafety/exceptionsafety.pro tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp Change-Id: I3c769a4a82dc2e99a12c69123fbf17613fd2ac2a |
||
---|---|---|
.. | ||
qabstractprintdialog | ||
qcolordialog | ||
qdialog | ||
qerrormessage | ||
qfiledialog | ||
qfiledialog2 | ||
qfilesystemmodel | ||
qfontdialog | ||
qinputdialog | ||
qmessagebox | ||
qprogressdialog | ||
qsidebar | ||
qwizard | ||
dialogs.pro |