| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16769
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We positioned the view beyond the bounds, which in some cases resulted
in only one item being created. Combined with a bug in the bounds
fixup very many items were created.
Task-number: QT-4441
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.
QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.
Task-number: QTBUG-16796
|
| |
| |
| |
| | |
Reviewed-by: Michael Brasser
|
|\ \
| |/ |
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
examples/webkit/imageanalyzer/imageanalyzer.h
examples/webkit/imageanalyzer/mainwindow.h
mkspecs/unsupported/qws/linux-x86-openkode-g++/qplatformdefs.h
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/corelib/kernel/qcoreapplication.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/plugins/bearer/connman/qconnmanservice_linux.cpp
src/plugins/platforms/openvglite/qwindowsurface_vglite.h
src/s60installs/bwins/QtCoreu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/s60installs.pro
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qdoc3/test/qt-html-templates.qdocconf
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Trust Me
|
| |
| |
| |
| |
| |
| |
| | |
This updates the tests to match the correct behaviour as of
1ba3e41f09ea719249286fede5d3fe96621ccb61
Task-number: QTBUG-16357
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16319
Reviewed-by: Martin Jones
|
|\ \
| |/ |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16356
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If the model is a VisualDataModel, the count will initally be zero
and modelCount is not updated due to itemsInserted() before the
component is completed.
Task-number: QTBUG-16357
Reviewed-by: Bea Lam
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
selftest_noimages and qdeclarativespringanimation were correct, updating
test scripts to match.
Task-number: QTBUG-14792
|
| |
| |
| |
| |
| |
| |
| | |
Minor changes in flickable and rectangle radius behaviours have led to
some altered pixels here and there.
Task-number: QTBUG-14792
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| | |
Call canFetchMore()/fetchMore() on setModel(), setRootIndex() and when
the last item is created.
Task-number: QTBUG-16039
Reviewed-by: Bea Lam
|
| | |
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16133
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| |
| |
| |
| | |
The grab was not always kept by filtering Flickables, but would remain
set next flick, resulting in toggling of flicking.
Task-number: QTBUG-16177
Reviewed-by: Michael Brasser
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
When delayRemove is true and all visible items are tagged to be
removed the visibleIndex became invalid and refill() began filling
from 0.
Task-number: QTBUG-16183
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15836
Reviewed-by: Michael Brasser
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| | |
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| | |
Check bounds in TextInput and TextEdit.
Task-number: QTBUG-16188
Reviewed-by: Bea Lam
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| |
| |
| |
| |
| | |
Url fragments and queries were being removed from the image ids
passed to QDeclarativeImageProvider.
Task-number: QTBUG-16195
Reviewed-by: Martin Jones
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/minehunt/minehunt.pro
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/plugins/phonon/mmf/mmf.pro
src/s60installs/s60installs.pro
tests/auto/qapplication/test/test.pro
tests/auto/qgraphicsview/tst_qgraphicsview.cpp
|
| |
| |
| |
| |
| |
| |
| | |
Current state reset mechanism does not really work for Text elements as the keeping implicit correct would require relayouting of text twice (See bug QTBUG-15118). Changed QDeclarativeState reset autotest to use Image element instead of Text element until the issue has been fixed.
Task-number:
Reviewed-by: Yann Bodson
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Martin Jones
|
| |
| |
| |
| | |
Reverted a commit 2eee49127b80b5b56c605f76ccea004b03d89577 "Remove active selection when TextEdit loses focus". Contrary to TextInput, by default TextEdit keeps the selection visible when the editor loses active focus. If this is not wanted, a property called persistentSelection can be set false to make selection dependant on the focus.
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-15341
Reviewed-by: Yann Bodson
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
scm.dev.nokia.troll.no:qt/qt-file-engines-refactor into master-integration
* 'earth/file-engine-refactor' of scm.dev.nokia.troll.no:qt/qt-file-engines-refactor: (224 commits)
Fix warnings, whitespace cleanup
Don't rely on uninitialized data
Doc: Fixing typo
Doc: Fixing typo
Skip failing tests
Use effective user id instead of getlogin
Fix compile error in tst_qfileinfo on Mac/Linux
Fix tst_QFileInfo owner() & group() failure on Windows.
Fix tst_QFileInfo::canonicalFilePath failure on Windows
Fix QDir::relativeFilePath
Fix spelling in comments
Add missing license header to test case
Define _WIN32_WINNT before any includes
New attempt at fixing compilation failure
Removing unused duplicate definitions
No symbolic links in Windows CE
Set minimum target Windows version to 2000
More missing includes
Add missing include
Fix compile error
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Due to the change from default deployment in symbian from being hardcoded
in qmake to being in default_deployment.prf the .pro files needed to be
changed.
Specifically, "DEPLOYMENT = foo" needs to be "DEPLOYMENT += foo" otherwise
the default deployment lines are not added and the test won't install.
Reviewed-By: Miikka Heikkinen
|
|\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If the view height is 0 no items will be created so the contentHeight
can not be estimated. The currentItem is usually created,
so it is possible to use that to estimate.
Task-number: QTBUG-16037
Reviewed-by: Bea Lam
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
configure
src/gui/graphicsview/qgraphicslayout.cpp
src/gui/text/qfontengine_s60.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/qwindowsurface_gl.cpp
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Removing the currentIndex could result in currentIndex being > than
the number of items in the model.
Task-number: QTBUG-15926
Reviewed-by: Michael Brasser
|
| |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/s60installs/eabi/QtGuiu.def
|
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We would previously call subFocusItemChanged(0) on the item as part of
clearing the subfocus, even if the item in question would recieve a new
subfocus item as part of setting the new subfocus.
This resulted in the declarative item emitting activeFocusChanged(false)
and then activeFocusChanged(true), which was affecting any animation or
state bound to the activeFocus property of the item.
We now stop clearing the subfocus when encountering an item that we know
will get subfocus during the set-subfocus pass. We then set subfocus all
the way to the root item, since the subfocus item itself might change.
The effect of this is that the declarative item will only get one call
to subFocusItemChanged(), passing the new subfocus item, instead of two.
This means the declarative item can keep track of wherther ot not it had
a subfocus item previously, and only emit activeFocusChanged() when the
active focus goes from true to false or false to true.
Task-number: QTBUG-15615
Reviewed-by: Yoann Lopes <yoann.lopes@nokia.com>
|