| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
master's version of conflicting def files picked.
Conflicts:
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
|
| | |
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab. This resulted
in a short jump before future events were handled by the nested item.
Task-number: QTBUG-15568
Reviewed-by: Bea Lam
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Flickable steals the grab, but the timer was not stopped and the
keepGrab flag is set and the mouse grabbed. This means that the WebView
now has the grab and subsequent clicks on another element are ignored.
Task-number: QTBUG-15529
Reviewed-by: Joona Petrell
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Moved to a personal repo, since its fate is a little uncertain so it
shouldn't draw this much attention.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
A tool to make it easier to do the platform visual updating. Needs to be
streamlined at least a little in order to make it feasible to stay up to
date.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | | |
Without a single test, it fails anyways.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Move tests for private classes inside private_tests scope
Add missing libraries
Add QT_NO_CONCURRENT ifdef around a test case
Define Q_DECLARATIVE_PRIVATE_EXPORT as Q_AUTOTEST_EXPORT,
so the classes are exported for autotests, previously
they were exported on every OS except symbian.
(this doesn't affect exports for production builds)
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/corelib/io/io.pri
src/corelib/io/qfsfileengine.cpp
src/corelib/io/qfsfileengine_unix.cpp
src/corelib/io/qfsfileengine_win.cpp
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtDeclarativeu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtDeclarativeu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qapplication/test/test.pro
tests/auto/qaudioinput/qaudioinput.pro
tests/auto/qaudiooutput/qaudiooutput.pro
tests/auto/qchar/qchar.pro
tests/auto/qdiriterator/qdiriterator.pro
tests/auto/qsound/qsound.pro
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/gui/kernel/qgesturemanager.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt.qdocconf
Changes in qmake/generators/win32/msvc_objectmodel.cpp come
from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We don't want to bother running tests on QWS, or text tests on X11 until
they update the ubuntu version.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | | |
Too unstable
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Text visual tests may be dependant on the specific version of
libfreetype. Comparison images have been regenerated with the specific
version that the test machines use.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | | |
These are no longer used by these tests
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added guidelines for size, and shrunk tests that exceeded them.
Also updated the visuals for all text tests now that antialiasing is off
Also some other minor cleanups.
Also had to update the visuals for all tests, due to the bug in
generating the test scripts being fixed (all need to be remade).
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Font antialiasing varies from machine to machine, and so is too unstable
Also switching to a monospaced font in visual tests to attempt to
pre-empt another possible source of instability.
This commit also slightly increases verbosity of test failure messages
to be more useful in the CI system
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Previous commit means that the snapshots are in different frames. All
tests must be updated.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | | |
Colored rects are better than text. At least here.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
One case of non-standardized text, and one case of what is presumably
random number generation.
Task-number: QTBUG-14792
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
doc/src/snippets/code/doc_src_qmake-manual.qdoc
mkspecs/features/symbian/application_icon.prf
mkspecs/features/symbian/default_post.prf
mkspecs/features/symbian/symbian_building.prf
qmake/generators/symbian/initprojectdeploy_symbian.cpp
src/multimedia/audio/audio.pri
src/network/access/qnetworkaccessmanager.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qgl_p.h
src/plugins/bearer/corewlan/qcorewlanengine.mm
src/plugins/phonon/mmf/mmf.pro
tests/auto/qscriptvalue/tst_qscriptvalue.cpp
tests/auto/qscriptvalue/tst_qscriptvalue.h
tools/qdoc3/doc/qdoc-manual.qdocconf
|
| | |
| | |
| | |
| | |
| | |
| | | |
Also add some visual tests for multi-line text elememts.
Task-number: QTBUG-15018
|
| | |\ |
|
| | | | |
|
| | |/
| | |
| | |
| | |
| | | |
Supposed to be in the last commit - not really helpful if the filter
says something is wrong but pushes it anyways.
|
| | |
| | |
| | |
| | |
| | | |
They all pass for me, and running them through CI will help find the
unstable ones.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Text elements now use shared components that have the same default
values, instead of using the system defaults (that can vary between
computers). This also removes text edit/input cursor blinking.
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
springanimation/follow.qml has had updated visuals, unknown cause.
the text tests were committed without an actual testcase, now added
the 'skip' property has now been documented in the tst_qmlvisual help
Task-number: QTBUG-14792
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Once fixup() begins, flick should not be recalculated.
Task-number: QTBUG-14821
Reviewed-by: Michael Brasser
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Also, the currentIndex stayed -1 since the views all bound to each
others currentIndex, which starts as -1.
Task-number: QTBUG-14794
Reviewed-by: Yann Bodson
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14865
Reviewed-by: Michael Brasser
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14915
Reviewed-by: Michael Brasser
|
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There were two problems. 1) layout() called fixup() was called while
the view was being flicked. 2) the snapping code was incorrect (and
duplicated).
Task-number: QTBUG-14821
Reviewed-by: Michael Brasser
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14792
|
| |\ \
| | |/ |
|
| | |\ |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14792
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
New mode requires them to at least compile.
Now that I've noticed this, removing that check on compile failures in
QDeclarativeTester.
Task-number: QTBUG-14792
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This reverts commit 8ba02a8f5a537b9f7e1ff671abe6eed67029db58.
ExpectFail state has been altered. Redoing that commit.
This commit also adds the new line to indicate tests we don't care about
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Also remove the check for the old way in tst_qmlvisual
Task-number: QTBUG-14792
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The bug found in gridview.qml doesn't actually stop the test from
passing, so it's now updated.
Task-number: QTBUG-14792
|
| | |/
| | |
| | |
| | |
| | | |
This reverts commit b6ee57e14e145d9caa3f572d55447ec92f78cea4.
Changed our mind about how to mark tests as expect-fail
|
| |\ \
| | |/ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This property can be set with a reason to skip the test (i.e. known bug)
and the failure will not count for blocking purposes.
This change also alters one of the failing tests to use the new property
Task-number: QTBUG-14792
Reviewed-by: Michael Brasser
|
| | |
| | |
| | |
| | |
| | |
| | | |
Still looking into text/fonts/plaintext which just developed an issue.
Task-number: QTBUG-14792
|