f6fc34294f
Conflicts: configure 5.7 now supports clang on android; but dev re-worked configure src/gui/kernel/qevent.h One side renamed a parameter of a constructor; the other added an alternate constructor on the next line. Applied the rename to both for consistency. tests/auto/tools/moc/tst_moc.cpp Each side added a new test at the end. .qmake.conf Ignored 5.7's change to MODULE_VERSION. configure.json No conflict noticed by git; but changes in 5.7 were needed for the re-worked configure to accommodate 5.7's stricter handling of C++11. Change-Id: I9cda53836a32d7bf83828212c7ea00b1de3e09d2
68 lines
1.3 KiB
Prolog
68 lines
1.3 KiB
Prolog
TEMPLATE=subdirs
|
|
|
|
SUBDIRS = bearerex \
|
|
filetest \
|
|
embeddedintoforeignwindow \
|
|
foreignwindows \
|
|
gestures \
|
|
highdpi \
|
|
inputmethodhints \
|
|
keypadnavigation \
|
|
lance \
|
|
network_remote_stresstest \
|
|
network_stresstest \
|
|
qcursor \
|
|
qdesktopservices \
|
|
qdesktopwidget \
|
|
qgraphicsitem \
|
|
qgraphicsitemgroup \
|
|
qgraphicslayout/flicker \
|
|
qhttpnetworkconnection \
|
|
qimagereader \
|
|
qlayout \
|
|
qlocale \
|
|
qmimedatabase \
|
|
qnetworkaccessmanager/qget \
|
|
qnetworkconfigurationmanager \
|
|
qnetworkconfiguration \
|
|
qnetworkreply \
|
|
qstorageinfo \
|
|
qscreen \
|
|
qssloptions \
|
|
qsslsocket \
|
|
qsysinfo \
|
|
qtabletevent \
|
|
qtexteditlist \
|
|
qtbug-8933 \
|
|
qtbug-52641 \
|
|
qtouchevent \
|
|
touch \
|
|
qwidget_zorder \
|
|
repaint \
|
|
socketengine \
|
|
textrendering \
|
|
widgets \
|
|
windowflags \
|
|
windowgeometry \
|
|
windowmodality \
|
|
widgetgrab \
|
|
xembed-raster \
|
|
xembed-widgets \
|
|
shortcuts \
|
|
dialogs \
|
|
windowtransparency \
|
|
unc
|
|
|
|
!contains(QT_CONFIG, openssl):!contains(QT_CONFIG, openssl-linked):SUBDIRS -= qssloptions
|
|
|
|
contains(QT_CONFIG, opengl) {
|
|
SUBDIRS += qopengltextureblitter
|
|
contains(QT_CONFIG, egl): SUBDIRS += qopenglcontext
|
|
}
|
|
|
|
win32: SUBDIRS -= network_remote_stresstest network_stresstest
|
|
|
|
lessThan(QT_MAJOR_VERSION, 5): SUBDIRS -= bearerex lance qnetworkaccessmanager/qget qmimedatabase qnetworkreply \
|
|
qpainfo qscreen socketengine xembed-raster xembed-widgets windowtransparency \
|
|
embeddedintoforeignwindow foreignwindows
|