J-P Nurmi 0fcce50af0 Merge remote-tracking branch 'origin/stable' into dev ... Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67		2014-06-05 22:26:44 +02:00
..
aix
android
c89
ios
mac
nacl
posix
qnx
wince
winrt_winphone
armcc.conf
clang-mac.conf
clang.conf
g++-base.conf
g++-macx.conf
g++-unix.conf
g++.conf
gcc-base-mac.conf
gcc-base-unix.conf
gcc-base.conf
ios.conf
linux-android.conf
linux.conf
llvm.conf
mac.conf
macx.conf
qcc-base-qnx-armv7le.conf
qcc-base-qnx-x86.conf
qcc-base-qnx.conf
qcc-base.conf
shell-unix.conf
shell-win32.conf
unix.conf