790aef362f
Conflicts: .qmake.conf configure src/corelib/global/qglobal.h src/tools/qdoc/node.cpp src/tools/qdoc/qdocdatabase.cpp tests/auto/corelib/io/qsettings/tst_qsettings.cpp tools/configure/configureapp.cpp Change-Id: I66028ae5e441a06b73ee85ba72a03a3af3e8593f |
||
---|---|---|
.. | ||
moc | ||
qdbuscpp2xml | ||
qdbusxml2cpp | ||
qmake | ||
qmakelib | ||
rcc | ||
uic | ||
tools.pro |