| Commit message (Collapse) | Author | Age | Files | Lines |
| |
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
examples/declarative/dynamic/qml/PerspectiveItem.qml
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Added an onCanceled signal to mouse area, which is triggered when the
mouse area rejects the event (propagates to the nearest
mouse area beneath) or some other element steals the mouse grab
(flickable, for example).
Task-number: QTBUG-10162
Reviewed-by: Michael Brasser
|
| |
| |
| |
| |
| | |
Task-number:
Reviewed-by: Warwick Allison
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (118 commits)
Avoid repeated create/destroy at top list boundary with sub-pixel movement.
Call QDeclarativeItem::geometryChanged() base implementation
qdoc fixes.
Avoid warnings as delegates with bindings to parent are created and destroyed.
qdoc fixes
TextInput echoMode doc.
Make sure to call base class implementation.
More cleanup
Cleanup
Cleanup
Use enum for drag.axis in doc and examples.
Add missing test file.
Fix autotest
Add QML_XHR_DUMP option
Compile
doc fixes
Doc: more clarification of cacheBuffer
Fix some compiler warnings.
Another initialization fix. Unleak.
Fix compile in namespace.
...
|
| | | |
|
| | |\ |
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativepainteditem.cpp
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | |/ |
|
| | |/
| | |
| | |
| | | |
Task-number: QTBUG-10359
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
translations/translations.pri
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the style option object should have QStyle::State_Sunken set in order
for styles to paint the button as pressed.
Merge-Request: 607
Reviewed-by: Andreas
|
| | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
fix crash in QLocalServer::close on Windows
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If _q_onNewConnection failed, then QLocalServer got into a bad state.
QLocalServer::isListening() still returned true and
QLocalServer::close() crashed.
Task-number: QTBUG-10388
Reviewed-by: ossi
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QS60Style: QTabWidget icon size property doesn't work
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QS60Style did check if the tab icon size was larger than pixel metric
for default tab icon size. If it was, then it reset the icon size to
match pixel metric. It was impossible to set large icon to tab widget.
As a fix, this check was removed from style.
Task-number: QTBUG-3102
Reviewed-by: Jason Barron
|
| | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
PowerVR screen driver using undefined symbols
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The PowerVR screen driver was using QTransformedScreen::tranformation()
which is in a class that is Q_AUTOTEST_EXPORT. That means that it would
only work with a developer build. This contributed patch changes it to
QScreen::transformOrientation() instead which is Q_GUI_EXPORT.
Task-number: QTBUG-10193
Reviewed-by: Lorn Potter
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QComboBoxPrivateScroller calls eraserects for menu scroller areas,
expecting the style to fill the gaps. Unfortunately, the QS60Style
does not draw menu scrollers at all
(but they are functional when interacted with).
Therefore, these areas are now drawn as holes.
As a fix, the eraseRect call from provate class
QComboBoxPrivateScroller is removed when "s60 flag" is defined.
Task-number: QTBUG-10371
Reviewed-by: Janne Koskinen
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Normally Qt uses scrollbuttons together at right (for LeftToRight UI)
side of the horizontal QTabBar; for vertical tab bar, scrollbuttons are
displayed below/above the widget.
Using QTabBar's scroll buttons with touch device that has capacitive
screen, is somewhat hard as the touch area for either of the scroll
buttons is somewhat smallish. So user is experiencing frequent wrong
taps. Making the touch area larger, would make the tabbar tab shape
area smaller, so it isn't a very good solution.
Therefore, when QS60Style is in use, QTabWidget draws the scrollbuttons
on either side of the QTabBar.
Task-number: QT-3104
Reviewed-by: Alessandro Portale
|
| | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Jason Barron
|
| |_|_|/
|/| | |
| | | |
| | | | |
Task-number: QTBUG-10458
|
|\ \ \ \ |
|
| |\ \ \ \ |
|
| | | | | | |
|
| |/ / / /
| | | | |
| | | | |
| | | | | |
Task-number: QTBUG-10385
|
| |\ \ \ \ |
|
| | | | | | |
|
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10353
|
| |/ / / / |
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On non-gl graphics systems smooth rendering of qDrawBorderPixmap()
with a transform applied resulted in ugly artifacts. Better to draw
without smooth and get a correct looking result, though with jaggy edges.
Task-number: QTBUG-5687
Reviewed-by: Gunnar
|
| |\ \ \ \ |
|
| | |\ \ \ \ |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
completed.
Task-number: QTBUG-9413
|
| | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-10386
|
| |\ \ \ \ \
| | |/ / / / |
|
| | |\ \ \ \ |
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Autogenerate a name for unnamed states: "anonymousState1", etc.
Task-number: QTBUG-10352
Reviewed-by: Aaron Kennedy
|
| | | |/ / / / |
|
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-10412
Reviewed-by: Aaron Kennedy
|
| | | | | | | |
|