Conflicts: src/corelib/global/qglobal.cpp src/corelib/global/qglobal.h src/corelib/global/qsysinfo.h src/corelib/global/qsystemdetection.h src/corelib/kernel/qobjectdefs.h src/plugins/plugins.pro tests/auto/widgets/itemviews/qlistview/qlistview.pro Change-Id: Ib55aa79d707c4c1453fb9d697f6cf92211ed665c |
||
|---|---|---|
| .. | ||
| apache_org.html | ||
| htmlinfo.pro | ||
| main.cpp | ||
| nokia_com.html | ||
| resources.qrc | ||
| simpleexample.html | ||
| trolltech_com.html | ||
| w3c_org.html | ||
| youtube_com.html | ||