whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
qt6-bb10/tests/auto/widgets/kernel/qwidget
History
Liang Qi 7555a92581 Merge remote-tracking branch 'origin/5.7' into 5.8 
5971b88e is not needed in new configure.

This merge also reverts "fix QMAKE_DEFAULT_*DIRS resolution with
apple SDK", 2c9d15d7, because it breaks iOS build with new
configure system.

Conflicts:
	mkspecs/features/default_pre.prf
	mkspecs/features/mac/toolchain.prf
	mkspecs/features/toolchain.prf
	src/dbus/qdbusconnection.cpp
	src/plugins/sqldrivers/mysql/qsql_mysql.cpp
	src/sql/drivers/mysql/qsql_mysql.cpp
	src/widgets/widgets/qmenubar.cpp
	src/widgets/widgets/qmenubar_p.h
	tools/configure/configureapp.cpp
	tools/configure/environment.cpp
	tools/configure/environment.h

Change-Id: I995533dd334211ebd25912db05b639d6f908aaec
 		2016-09-21 11:57:52 +02:00
..
testdata/paintEvent Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
.gitignore Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
BLACKLIST Blacklisting tst_QWidget::saveRestoreGeometry test on Ubuntu 16.04 2016-08-18 11:37:15 +00:00
geometry-fullscreen.dat Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
geometry-maximized.dat Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
geometry.dat Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
qwidget.pro remove redundant x11 handling 2016-08-10 15:43:11 +00:00
qwidget.qrc Moved tests into integrationtests/ and widgets/ 2011-10-20 19:45:41 +02:00
tst_qwidget.cpp Merge remote-tracking branch 'origin/5.7' into 5.8 2016-09-21 11:57:52 +02:00
tst_qwidget_mac_helpers.h Updated license headers 2016-01-21 18:55:18 +00:00
tst_qwidget_mac_helpers.mm Updated license headers 2016-01-21 18:55:18 +00:00