| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/samegame/SamegameCore/samegame.js
mkspecs/features/symbian/default_post.prf
src/declarative/qml/qdeclarativeengine.cpp
src/gui/text/qtextdocumentlayout.cpp
src/plugins/plugins.pro
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/eabi/QtCoreu.def
src/s60installs/eabi/QtGuiu.def
src/s60installs/s60installs.pro
tests/auto/declarative/declarative.pro
tests/auto/declarative/qdeclarativedebug/tst_qdeclarativedebug.cpp
tests/auto/declarative/qdeclarativepixmapcache/tst_qdeclarativepixmapcache.cpp
tests/auto/declarative/qmlvisual/qmlvisual.pro
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-17114
Reviewed-by: Bea Lam
|
| | |
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| | |
If the created item does not have a valid width/height then our
implictWidth/Height should be the same as the items implict size.
Task-number: QTBUG-16928
Reviewed-by: Bea Lam
|
|\ \
| | |
| | |
| | |
| | |
| | | |
Conflicts:
configure
src/network/bearer/bearer.pri
|
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
This reverts commit 82ff3f484c7ec49e60b7fddf23794937974a6768.
QTBUG-16796 reports that this commit is causing regressions
relating to initial sizing of items.
Task-number: QTBUG-16796
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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
|
| |
| |
| |
| |
| | |
Task-number: QTBUG-16319
Reviewed-by: Martin Jones
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Complement previous commit by aligning Qt itself to use .files
consistently for DEPLOYMENT as well as INSTALLS.
This excludes changes to webkit.
Task-number: QTBUG-3216
Reviewed-by: axis
|
|/
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
Task-number: QTBUG-13481
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
|
| |
|
| |
|
|
|
|
| |
Task-number: QTBUG-11771
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
|
|
|
|
| |
Task-number: QTBUG-10766
Reviewed-by: Yann Bodson
|
|
|
|
|
|
|
|
| |
statusChanged is NOT emitted for local files, nor should it be (they
are loaded synchronously, so status is *initially* Ready). Add onLoaded
signal that *is* emitted.
Reviewed-by: Michael Brasser
|
|
|
|
|
| |
Task-number: QTBUG-9491
Reviewed-by: Martin Jones
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
| |
The explicit resizeMode is superfluous, all usecases could be achieved
with the corrected default behaviour of the former ResizeLoaderToItem
mode. The NoResize usecase is covered by wrapping the loader in an extra
item.
That means: A loader automatically gets its size from the item loaded
unless the loader has an explicit size itself.
Go-ahead-by: Michael Brasser
|
|
|
|
|
|
| |
Since we aren't releasing for 4.6, all types are new in 4.7.
Task-number: QTBUG-10081
|
| |
|
| |
|
|
|
|
| |
QTBUG-9726
|
|
|
|
|
| |
Task-number:
Reviewed-by: Martin Jones
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
| |
|
|
|
|
|
| |
Previously we were not outputting those that occurred on
component->create().
|
| |
|
|
|
|
|
| |
Extends upon 95aa8c8fc76e2309a629b05994a2677b0887140b.
Still under discussion.
|
| |
|
|
|
|
|
|
|
|
|
| |
If setting the source of a Loader triggered a change to the source
(i.e. the thing being loaded set the source to something else) a crash
would occur. We now no longer delete the component immediately when the
source changes.
Task-number: QTBUG-9241
|
| |
|
|
|
|
| |
to QDeclarativeXXX.
|
|
QDeclarativeXXX.
|