a1fe728fa5
Conflicts: src/gui/kernel/qguiapplication.cpp src/plugins/platforms/android/androidjnimain.cpp src/plugins/platforms/android/qandroidplatformintegration.cpp src/plugins/platforms/android/qandroidplatformintegration.h src/plugins/platforms/android/qandroidplatformopenglcontext.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/sql/doc/src/sql-driver.qdoc src/widgets/widgets/qtoolbararealayout.cpp Change-Id: Ifd7e58760c3cb6bd8a7d1dd32ef83b7ec190d41e |
||
---|---|---|
.. | ||
colordialogpanel.cpp | ||
colordialogpanel.h | ||
dialogs.pro | ||
filedialogpanel.cpp | ||
filedialogpanel.h | ||
fontdialogpanel.cpp | ||
fontdialogpanel.h | ||
main.cpp | ||
messageboxpanel.cpp | ||
messageboxpanel.h | ||
printdialogpanel.cpp | ||
printdialogpanel.h | ||
utils.cpp | ||
utils.h | ||
wizardpanel.cpp | ||
wizardpanel.h |