b1a216649e
Conflicts: qmake/generators/makefile.cpp qmake/generators/unix/unixmake2.cpp src/corelib/thread/qthread_unix.cpp tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp Change-Id: I1df0d4ba20685de7f9300bf07458c13376493408 |
||
---|---|---|
.. | ||
qcolordialog | ||
qdialog | ||
qerrormessage | ||
qfiledialog | ||
qfiledialog2 | ||
qfilesystemmodel | ||
qfontdialog | ||
qinputdialog | ||
qmessagebox | ||
qprogressdialog | ||
qsidebar | ||
qwizard | ||
dialogs.pro |