Go to file
Lars Knoll db92f2f3aa Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
	.qmake.conf
	mkspecs/win32-g++/qmake.conf
	src/corelib/global/qglobal_p.h
	src/corelib/global/qoperatingsystemversion_p.h
	src/corelib/io/qfilesystemengine_win.cpp
	src/network/bearer/qbearerengine.cpp
	src/platformsupport/input/libinput/qlibinputpointer.cpp
	src/sql/doc/snippets/code/doc_src_sql-driver.cpp
	src/widgets/kernel/qwidget_p.h
	src/widgets/kernel/qwidgetwindow.cpp
	src/widgets/styles/qfusionstyle.cpp
	tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp

Change-Id: I80e2722f481b12fff5d967c28f89208c0e9a1dd8
2017-12-30 12:09:53 +01:00
bin Fix macOS shadow prefix builds using pre-synced source packages 2017-11-22 07:39:45 +00:00
config.tests Clean up OS version checks for Apple platforms 2017-09-29 03:30:13 +00:00
dist Changelog edit: move the X11 entries from "Linux" to "X11" 2017-11-24 05:23:55 +00:00
doc Doc: complete Draggable Text example 2017-12-19 13:43:15 +00:00
examples Doc: remove Config Dialog Example 2017-12-27 14:41:18 +00:00
lib
mkspecs Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
qmake Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
src Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
tests Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
util Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
.gitattributes
.gitignore gitignore: don't ignore Info.plist templates for libraries 2017-11-23 07:07:48 +00:00
.qmake.conf Bump version 2017-12-20 12:05:48 +01:00
.tag
config_help.txt configure: support discarding selected test results with -recheck 2017-12-14 18:02:30 +00:00
configure configure: dispose of which.test 2017-08-02 16:37:32 +00:00
configure.bat configure: balk at any of {{,X}QMAKESPEC,QMAKE{PATH,FEATURES}} being set 2017-04-21 09:22:27 +00:00
configure.json Export sanitizer as a global config 2017-12-18 16:20:58 +00:00
configure.pri Merge remote-tracking branch 'origin/5.9' into 5.10 2017-12-30 12:09:53 +01:00
header.BSD
header.COMM
header.FDL
header.GPL
header.GPL-EXCEPT
header.LGPL
header.LGPL3
header.LGPL3-COMM
header.LGPL21
header.LGPL-NOGPL2
header.LGPL-ONLY
INSTALL
LGPL_EXCEPTION.txt
LICENSE.FDL
LICENSE.GPL2
LICENSE.GPL3
LICENSE.GPL3-EXCEPT
LICENSE.GPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPL3
LICENSE.LGPLv3 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.LGPLv21 Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit" 2016-06-15 07:02:32 +00:00
LICENSE.PREVIEW.COMMERCIAL
qtbase.pro nuke configure -host-option 2016-12-13 18:55:59 +00:00
sync.profile Fix syncqt after commit 40fe5d43fd 2017-09-08 13:21:47 +00:00