a09a8d509a
Conflicts:
mkspecs/qnx-x86-qcc/qplatformdefs.h
src/corelib/global/qglobal.h
src/network/socket/qnativesocketengine_winrt.cpp
src/plugins/platforms/android/androidjniaccessibility.cpp
src/plugins/platforms/windows/qwindowswindow.cpp
Manually adjusted:
mkspecs/qnx-armle-v7-qcc/qplatformdefs.h
to include
|
||
---|---|---|
.. | ||
almostplugin | ||
elftest | ||
lib | ||
machtest | ||
theplugin | ||
tst | ||
.gitignore | ||
empty.json | ||
fakeplugin.cpp | ||
qpluginloader.pro | ||
tst_qpluginloader.cpp |