| Commit message (Collapse) | Author | Age | Files | Lines |
|\ |
|
| |
| |
| |
| | |
The image is copied from Qt Mobility.
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/development/qmake-manual.qdoc
mkspecs/symbian-gcce/qmake.conf
qmake/project.cpp
src/corelib/global/qnamespace.qdoc
src/declarative/graphicsitems/qdeclarativetext.cpp
src/gui/text/qtextdocumentlayout.cpp
src/gui/text/qtextdocumentlayout_p.h
tests/auto/declarative/qdeclarativetext/tst_qdeclarativetext.cpp
tests/auto/networkselftest/networkselftest.pro
tests/auto/qscriptengine/tst_qscriptengine.cpp
tools/designer/src/components/signalsloteditor/signalslot_utils.cpp
tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt-html-templates_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf
|
| |\ |
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17120
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17120
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-14274
|
| |/ / |
|
|\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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:
Reviewed-by: Alan Alpert
|
|\ \
| |/
| |
| |
| |
| | |
Conflicts:
src/s60main/newallocator_hook.cpp
tools/runonphone/serenum_unix.cpp
|
| |
| |
| |
| | |
Reviewed-by: David Boddie
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
demos/declarative/snake/snake.qml
qmake/generators/symbian/symbiancommon.cpp
src/network/access/qnetworkaccessmanager.cpp
src/s60installs/s60installs.pro
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
|
| |
| |
| |
| | |
QtWebKit Image Analyzer example.
|
| |\ |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Originally written by Jervey Kong.
Task-number: QTBUG-14154
Reviewed-by: David Boddie
|
|\ \ \
| | |/
| |/| |
|
| |/ |
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | |
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
bin/syncqt
demos/declarative/snake/content/snake.js
demos/declarative/snake/snake.qml
doc/src/development/qmake-manual.qdoc
src/corelib/plugin/plugin.pri
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qdesktopwidget_win.cpp
src/gui/painting/qdrawhelper.cpp
tests/auto/qdir/tst_qdir.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
|
| | |
|
| |\ |
|
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-11333
Reviewed-by: axis
|
| | | |
|
| |\ \
| | |/ |
|
| | | |
|
| | | |
|
| |/
|/| |
|
|/ |
|
|
|
|
|
| |
Task-number: QTBUG-12720
Reviewed-by: David Boddie
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Add missing image
Mention scope of id uniqueness
Update QML Documents example
add license header
doc: Add a note about QCoreApplication::applicationDirPath
Add license header
Add moving and flicking properties to PathView
Improve utility of QMLViewer
Add missing \l doc commands
Document elements that are focus scopes.
Remove use of shared NOTIFY signals in QGraphicsScale
Remove use of shared NOTIFY signals
|
| |
| |
| |
| | |
Task-number: QTBUG-12529
|
|/ |
|
|\ |
|
| | |
|
| | |
|
|/ |
|
|\
| |
| |
| |
| | |
Conflicts:
tools/qdoc3/test/qt.qdocconf
|
| | |
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
synchronous loading of QImages. (QPixmaps can only be created in the
main thread so they will always be loaded synchronously).
This changes request() to requestImage() and adds requestPixmap()
for pixmap support.
Task-number: QTBUG-11989
|
| | |
|
| | |
|
|/ |
|
| |
|
| |
|
| |
|
| |
|