AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
c5a3e5edd9
qt5base-lts/tests/auto/gui/text
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
..
qabstracttextdocumentlayout QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qcssparser Android: Fix tests in gui/text requiring test data 2014-07-21 09:49:09 +02:00
qfont tst_QFont: remove unused static function 2014-07-28 10:58:06 +02:00
qfontcache QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qfontdatabase Fix fallbacks for adapted common script 2014-07-10 10:01:49 +02:00
qfontmetrics Fix QFontMetrics width 2014-02-20 20:13:27 +01:00
qglyphrun Fix several regressions in font selection 2014-08-20 13:10:55 +02:00
qrawfont Merge remote-tracking branch 'origin/5.3' into dev 2014-07-22 20:21:19 +02:00
qstatictext Merge remote-tracking branch 'origin/release' into stable 2014-03-17 12:29:11 +01:00
qsyntaxhighlighter Remove some manual qWait and use QTRY_VERIFY instead. 2014-08-18 20:57:20 +02:00
qtextblock QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qtextcursor QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qtextdocument Fix incorrect repaints with plain text edit 2014-04-30 18:23:23 +02:00
qtextdocumentfragment Restore -qt-block-indent on <li> elements 2014-09-18 17:55:03 +02:00
qtextdocumentlayout QTextEngine: fix layouting of inline objects in right-aligned tabs. 2013-12-05 16:40:06 +01:00
qtextformat Allow QTextCharFormat::setFont() to skip unresolved font props 2014-01-31 00:24:48 +01:00
qtextlayout Fix crash in QTextLayout::cursorToX 2014-09-02 14:18:08 +02:00
qtextlist expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
qtextobject QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qtextodfwriter QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qtextpiecetable expand tabs and related whitespace fixes in *.{cpp,h,qdoc} 2014-01-13 22:46:50 +01:00
qtextscriptengine Merge remote-tracking branch 'origin/5.3' into 5.4 2014-09-23 11:23:36 +02:00
qtexttable QtGui tests: Remove DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 2013-03-27 03:54:42 +01:00
qzip Android: Fix tests in gui/text requiring test data 2014-07-21 09:49:09 +02:00
text.pro Fix the font engines leaking 2013-03-20 07:02:29 +01:00