| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/corelib/kernel/qobject.h
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativeflickable_p_p.h
src/declarative/util/qdeclarativelistmodel.cpp
|
| | |\ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
Reviewed-by: David Boddie
Tasks: QTBUG-10077
|
| | |\ \ |
|
| | | |\ \
| | | |/ |
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Cleaned up the contradiction identified in QTBUG-10114.
Reviewed-by: David Boddie
Bug: QTBUG-8961, QTBUG-10114
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed by: David Boddie
Task: QTBUG-13243
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Tasks: QTBUG-13271, QTBUG-13212, QTBUG-12321
Reviewer: David Boddie
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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
|
| | | | | |
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/|
| | | |
| | | | |
Conflicts:
doc/src/snippets/declarative/qml-intro/basic-syntax.qml
|
| | | |/
| | |
| | |
| | |
| | | |
Task-number:
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | | |
Reported on the qt-qml mailing list.
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\ \
| | |/ |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | | | |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Pkg_prerules and pkg_postrules can now be targeted to apply only to
main template pkg, installer pkg, or stub pkg file using
.main, .installer, or .stub suffix on the variable.
Also clarified documentation of these variables.
Task-number: QTBUG-13159
Reviewed-by: axis
|
| |\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
qmake/generators/win32/msbuild_objectmodel.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/opengl/opengl.pro
src/opengl/qgl_p.h
src/plugins/bearer/connman/qconnmanservice_linux.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/assistant/tools/assistant/openpageswidget.h
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QString::split has overload, and if you want to take the address of a
function with overload, you need to cast it. If we really wanted to use
QString::split, we would have to do
QFuture<QStringList> future = QtConcurrent::run(string, static_cast<QStringList (QString::*)(const QString &, QString::SplitBehavior, Qt::CaseSensitivity ) const>(&QString::split), QString (", "), QString::KeepEmptyParts, Qt::CaseSensitive);
So use QByteArray::split as an example instead
Task-number: QTBUG-12897
Reviewed-by: David Boddie
|
| | | |/
| |/| |
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
a State (e.g. for setting a transformOrigin for a RotationAnimation).
Also improve some other animation docs in general.
|
| |\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/painting/qpainter.cpp
src/gui/text/qtextengine.cpp
tests/auto/qimage/tst_qimage.cpp
tests/auto/qpainter/tst_qpainter.cpp
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
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
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | |
| | | |
Reviewer: David Boddie
Task number: QTBUG-10411
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Update def files for d524da81ee257a6bd67d32d0bc870280a7d5b8a4.
Remove useless QString::clear() from QSharedData example snippet.
Move note on connectToBus() not actually being able to reconnect to
Designer: Prevent rich text from being copied into style sheets.
QXmlPatterns QAbstractDateTime: only parse 3 digits of time fraction
qdoc: Removed three unused config variables.
qdoc: Cleaned up the application option specification and use.
Doc: Adding GS QML example files
Doc: Images for QML GS
Doc: Editied version of QML GS
Doc: Adding text to GS page
Fix link error when building Bearer application with Qt Mobility
Doc: nesting up orphant pages
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 2443
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| | | |/
| | |
| | |
| | | |
Task-number: QTBUG-12666
|
| | |\ \
| | |/ |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-12628
|
| | |\ \
| | | |
| | | |
| | | | |
integration
|
| | | | | |
|
| | |\ \ \
| | | |/
| | |/| |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12570
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12526
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-12447
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
this page from other documentation.
Task-number: QTBUG-12446
|