6755ec891a
Conflicts: configure qmake/Makefile.unix.macos qmake/Makefile.unix.win32 qmake/generators/win32/msvc_vcproj.cpp src/3rdparty/pcre/qt_attribution.json src/corelib/io/qsettings.cpp src/corelib/kernel/qdeadlinetimer.cpp src/platformsupport/kmsconvenience/qkmsdevice.cpp src/platformsupport/kmsconvenience/qkmsdevice_p.h src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/qeglfskmsgbmscreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldeviceintegration.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/qeglfskmsegldevicescreen.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsdevice.cpp src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/qeglfskmsscreen.h tests/manual/qstorageinfo/printvolumes.cpp tools/configure/configureapp.cpp Change-Id: Ibaabcc8e965c44926f9fb018466e8b132b8df49e |
||
---|---|---|
.. | ||
android | ||
compiler | ||
gestures | ||
lancelot | ||
languagechange | ||
macgui | ||
macnativeevents | ||
macplist | ||
modeltest | ||
networkselftest | ||
qaccessibility | ||
qaccessibilitylinux | ||
qaccessibilitymac | ||
qcomplextext | ||
qfocusevent | ||
qnetworkaccessmanager_and_qprogressdialog | ||
qobjectperformance | ||
qobjectrace | ||
qprocess_and_guieventloop | ||
qsharedpointer_and_qwidget | ||
qtokenautomaton | ||
qvariant_common | ||
toolsupport | ||
other.pro |