AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c5a3e5edd9
qt5base-lts/tests/auto/widgets/kernel
History
Frederik Gladhorn c5a3e5edd9 Merge remote-tracking branch 'origin/5.3' into 5.4 
The isAlwaysAskOption was removed in 3862171315
so manually removed code in
src/plugins/bearer/connman/qconnmanengine.cpp

Conflicts:
	src/corelib/global/qglobal.h
	src/corelib/tools/qcollator_macx.cpp
	src/corelib/tools/qstring.cpp
	src/gui/kernel/qwindow.cpp
	src/gui/kernel/qwindow_p.h
	src/gui/text/qtextengine.cpp
	src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h
	src/plugins/platforms/android/qandroidinputcontext.cpp
	src/plugins/platforms/xcb/qglxintegration.cpp
	src/plugins/platforms/xcb/qglxintegration.h
	src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
	src/testlib/qtestcase.cpp
	src/testlib/qtestlog.cpp
	src/widgets/dialogs/qfiledialog.cpp
	src/widgets/kernel/qwindowcontainer.cpp
	tests/auto/corelib/tools/qcollator/tst_qcollator.cpp
	tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp
	tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp
	tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp

Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
2014-09-23 11:23:36 +02:00
..
qaction QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qactiongroup QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qapplication OS X: Fix pan gestures. 2014-08-25 16:07:36 +02:00
qboxlayout Avoid adding widget to its own layout 2014-09-05 00:05:45 +02:00
qdesktopwidget QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qformlayout Avoid adding widget to its own layout 2014-09-05 00:05:45 +02:00
qgridlayout Avoid adding widget to its own layout 2014-09-05 00:05:45 +02:00
qlayout QSizePolicy - add retainSizeWhenHidden 2013-07-10 09:26:31 +02:00
qshortcut expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
qsizepolicy QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qstackedlayout Add widget replace function to QLayout 2013-09-21 23:17:55 +02:00
qtooltip QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qwidget tst_QWidget: Skip tests that don't pass with qwindow-compositor. 2014-08-20 21:45:15 +02:00
qwidget_window Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-23 11:23:36 +02:00
qwidgetaction QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qwidgetmetatype QtWidgets tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-28 02:02:14 +01:00
qwidgetsvariant Update QVariant tests 2014-07-10 13:14:40 +02:00
qwindowcontainer tst_qwindowcontainer: Convert some QVERIFYs to QCOMPAREs 2014-08-18 13:53:01 +02:00
kernel.pro Introducing QWidget::createWindowContainer() 2013-01-25 14:11:07 +01:00