| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
|
|
|
| |
Simple search and replace. This commit doesn't touch 3rd-party files,
nor translations (where the change is not so simple and will be handled
in a separate commit).
Change-Id: I4e48513b8078a44a8cd272326685b25338890148
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
|
| |\
| |
| |
| |
| | |
Conflicts:
src/network/ssl/qsslcertificate.cpp
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging:
QDeclarative::hasActiveFocus should return false for hidden items
FocusScope's focusItem must always be a descendent
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
In graphics view you can be the focus item without being visible,
but you still won't receive events. QML should hide these distinctions.
Task-number: QTBUG-21045
|
| |\ \ \
| |/ /
|/| |
| | |
| | | |
Conflicts:
doc/src/index.qdoc
|
| | | |
| | |
| | |
| | |
| | |
| | | |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
Reapplied after bad v4.7.4 merge
|
| |\ \ \
| |/ /
| | /
| |/
|/|
| | |
Conflicts:
doc/src/index.qdoc
src/xmlpatterns/expr/qevaluationcache_p.h
|
| | |
| |
| |
| | |
(cherry picked from commit 609dc22f719ecb8d48349fd56f84960bbf46d731)
|
| |\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/righttoleft.qdoc
examples/draganddrop/fridgemagnets/main.cpp
examples/script/context2d/main.cpp
|
| | |\
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Remove unnecessary QtQuick 1.1 effectiveLayoutDirection, effectiveHorizontalAlignment and anchors.mirror properties
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
effectiveHorizontalAlignment and anchors.mirror properties
* these properties are seldomly used
* they confuse developers that do not care about right-to-left user interfaces
* LayoutMirroring.enabled property can be used instead to determine if mirroring is enabled
* if needed, you can easily determine the effective layout directions and alignments
with a little bit of JavaScript:
function effectiveLayoutDirection() {
if (LayoutMirroring.enabled)
return (listView.layoutDirection == Qt.LeftToRight) ? Qt.RightToLeft : Qt.LeftToRight;
else
return listView.layoutDirection;
}
Task-number: QTBUG-11042
Reviewed-by: Martin Jones
|
| | |/
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/gui/text/qrawfont.cpp
src/gui/text/qtextlayout.cpp
src/gui/util/qscroller.cpp
src/gui/widgets/qlineedit.cpp
|
| | |/
| |
| |
| |
| |
| |
| | |
Updated version of LGPL and FDL licenseheaders.
Apply release phase licenseheaders for all source files.
Reviewed-by: Trust Me
|
| |/ |
|
| |\
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/declarativeui.qdoc
doc/src/examples/qml-examples.qdoc
|
| | |
| |
| |
| | |
Clarify some of the docs and fix some broken doc links.
|
| | |
| |
| |
| | |
Change-Id: I80d2247cd05ef71907bbf690e8e68a8860a65d4c
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativelistview.cpp
Change-Id: Ic21311365c6139520ae337a379bdedb6ffe497db
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging: (216 commits)
Doc: Fixed a reference to the wrong image.
Fixed a bug that caused marked up inline text to be truncated.
Doc: Renamed an image to ensure that it does not clash with another.
Doc: Fixed QML, unindented snippet.
Doc: Removed unnecessary HTML entity from the title.
Doc: Fixed broken links to the old Symbian Foundation Wiki.
Doc: Updated the copyright statements in the templates.
Doc: Fixing typo
Replace all occurances of "Qt 4.7" with "QtQuick 1.0"
Doc: Adjusted the font sizes for the offline documentation.
Doc: Added a missing style sheet to the qhp manifest.
Doc: Fixed the qthelp namespace for the Qt documentation.
Doc: including missing pages in overviews.
Doc: Fixed typo in QCoreApplication docs
Fixed whitespace.
Avoid hard-coding product names in page titles.
Doc: Unindented a code snippet.
Doc: Fixed confusing wording of a sentence.
Doc: Fixed a broken link.
Doc: Updated the information about commercial editions of Qt.
...
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
enabled
Task-number: QTBUG-15882
Reviewed-by: Martin Jones
Change-Id: I4c9f0b48e089b30ced5e7fefa5d6e97b3155f3b2
|
| | |/ /
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-17280
Reviewed-by: Martin Jones
Change-Id: I34a623b49ce0fd5c05ae7a7ea5d0437c107b8a9b
|
| | | | |
|
| | | | |
|
| |\ \ \
| |/ /
| | /
| |/
|/| |
|
| | |
| |
| |
| | |
Task-number: QTBUG-16973
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| | |
Overridden as readonly for elements that have an inherent implicit size
such as Text, TextEdit, TextInput, positioners, Loader.
Task-number: QTBUG-14957
Reviewed-by: Michael Brasser
|
| | |\ |
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
tests/auto/declarative/qdeclarativexmllistmodel/tst_qdeclarativexmllistmodel.cpp
|
| | |\ \ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
When using KeyNavigation, if the "visible" or "enabled" property of
the item set in the KeyNavigation handler is false, an attempt will
be made to skip this item and setFocus to the following item.
Task-number: QTBUG-15862
Reviewed-by: Martin Jones
|
| | | | | | |
|
| |\ \ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/util/qdeclarativeanimation.cpp
|
| | | |_|_|/
| |/| | | |
|
| | | |_|/
| |/| |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Moved 'Identity' and 'Property Change Signals' sections from Item
docs to the intro page, which previously had a section on ids but
this has been moved out of the 'Properties' section since an id isn't
an ordinary property.
|
| |/ / / |
|
| |\ \ \
| | |/
| |/| |
|
| | | |
| | |
| | |
| | |
| | | |
Make it clear that anchor margins only apply to anchors. Also
document that anchor and absolute positioning cannot be mixed.
|
| | |/
| |
| |
| | |
Task-number: QTBUG-15802
|
| |\ \
| |/ |
|
| | | |
|
| |/
|
|
| |
Task-number: QTBUG-15569
|
| |
|
|
|
|
|
|
|
| |
Once from QGraphicsObject (QGraphicsItemPrivate::setPosHelper()) and
once from QDeclarativeItem::geometryChanged(). Remove from
geometryChanged().
Task-number: QTBUG-14942
Reviewed-by: Michael Brasser
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (51 commits)
Revert "qmake: pass include directories to MS resource compiler"
Fix User 46 Panic in bearer management on Symbian.
Assistant: Insert all keywords with empty ids, as ids are not mendatory.
qmake: delete .pdb file when making 'distclean' instead of 'clean'
qmake: pass include directories to MS resource compiler
use specified pkg-config
qmake/symbian: Add icons with backslashes in pkg files
Make qtconfig help messages translatable
remove exec bits again ...
Add TIFFClose to QTIffHandler::option() to avoid memory leak
[QCocoaView scrollWheel:] can end up recursing infinitely when a scrollWheel event is sent to two stacked MDI windows
Added missing QtWebKit example files and some whitespace fixes.
Added missing native separator transforms.
Doc: tuning search reasult box
qdoc: Don't generate html output for png files.
Doc: Correcting Windows CE 6.0 to Windows Embedded CE 6.0
Doc: correcting bug - lenght() pointed to setLength() in "See also" section. Correct link is resize()
Doc: correct spelling
Doc: correcting spelling - qdbusxml2dcpp to qdbusxml2cpp
Doc: correcting grammar on the installation pages
...
|
| | |\ |
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Trust Me
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-13685
Reviewed-by: Michael Brasser
|
