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 9ce697f2d5
Thanks goes to Sergio for the qnx mkspecs adjustments.
Change-Id: I53b1fd6bc5bc884e5ee2c2b84975f58171a1cb8e
76 lines
1.6 KiB
Prolog
76 lines
1.6 KiB
Prolog
TEMPLATE=subdirs
|
|
SUBDIRS=\
|
|
# atwrapper \ # QTBUG-19452
|
|
baselineexample \
|
|
compiler \
|
|
d3dcompiler \
|
|
gestures \
|
|
headersclean \
|
|
lancelot \
|
|
languagechange \
|
|
macgui \
|
|
macnativeevents \
|
|
macplist \
|
|
modeltest \
|
|
networkselftest \
|
|
qaccessibility \
|
|
qaccessibilitylinux \
|
|
qaccessibilitymac \
|
|
qcomplextext \
|
|
qfocusevent \
|
|
qnetworkaccessmanager_and_qprogressdialog \
|
|
qobjectperformance \
|
|
qobjectrace \
|
|
qsharedpointer_and_qwidget \
|
|
qprocess_and_guieventloop \
|
|
qtokenautomaton \
|
|
windowsmobile \
|
|
|
|
!qtHaveModule(widgets): SUBDIRS -= \
|
|
baselineexample \
|
|
gestures \
|
|
headersclean \
|
|
lancelot \
|
|
languagechange \
|
|
modeltest \
|
|
qaccessibility \
|
|
qfocusevent \
|
|
qnetworkaccessmanager_and_qprogressdialog \
|
|
qsharedpointer_and_qwidget \
|
|
windowsmobile \
|
|
qaccessibility \
|
|
qaccessibilitylinux \
|
|
qaccessibilitymac \
|
|
|
|
!qtHaveModule(network): SUBDIRS -= \
|
|
baselineexample \
|
|
headersclean \
|
|
lancelot \
|
|
networkselftest \
|
|
qnetworkaccessmanager_and_qprogressdialog \
|
|
qobjectperformance
|
|
|
|
testcocoon: SUBDIRS -= headersclean
|
|
|
|
cross_compile: SUBDIRS -= \
|
|
atwrapper \
|
|
compiler
|
|
|
|
wince*|!contains(QT_CONFIG, accessibility): SUBDIRS -= qaccessibility
|
|
|
|
!angle_d3d11: SUBDIRS -= d3dcompiler
|
|
|
|
!contains(QT_CONFIG, accessibility-atspi-bridge): SUBDIRS -= qaccessibilitylinux
|
|
|
|
!mac: SUBDIRS -= \
|
|
macgui \
|
|
macnativeevents \
|
|
macplist \
|
|
qaccessibilitymac
|
|
|
|
!embedded|wince*: SUBDIRS -= \
|
|
qdirectpainter
|
|
|
|
winrt: SUBDIRS -= \
|
|
qprocess_and_guieventloop
|