| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
| |
Apparently structs are not socially acceptable.
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (77 commits)
Recompute the source location of regexp literals.
Adds a way to clear the state list property in QDeclarativeStateGroup
I've been told this fixes compilation on windows.
Doc Augmentation
Added highlight ranges/modes to PathView
Use QThread IdlePriority rather than linux platform code.
Test and fix order of transform application.
Test transforms.
Fix namespace.
Simple case, no size returned.
sourceWidth/sourceHeight -> sourceSize
QDeclarativeItem don't need to emit childrenChanged anymore.
Control of image rendered size (esp. SVG).
Do not call parent implementation if we accept the keyPressEvent in GridView and ListView delegates.
Update test.
Add autotest for QTBUG-9367.
Remove Q prefix from the validators.
Really fix qMin() parameter types.
Add declarative subdir to examples.pro
Add Symbian deploy section for qml import plugins
...
|
| | |
| |
| |
| | |
Remove Translate.z since Qt cannot sensibly support it yet.
|
| | |\
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Stabilize QGraphicsEffect test on X11
Add a children private property needed for QML to support QGraphicsObject
Invalidate the cache of QGraphicsEffect if a child becomes visible.
Fix a crash when reparenting an item in QGraphicsView.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Commit adds a private property that QML can use to add children for a given
item. This is a custom list that calls a callback which actually reparent
the item instead of just appending in the list (otherwise it will mess up
the state of QGraphicsView). This is needed because childItems() is pretty
useless you get a list but if you append something on it then it adds
that into a copy. Also the children property is the default property
a concept used by QML.
Width and Height private properties has been added in order to support
better the integration with QGraphicsWidget in QML. The actual implementation
is in the private class of QGI and QGraphicsWidget reimplements it to return
the geometry. (In 4.7 QDeclarativeItem reimplements it too).
This change should be harmless everything is private.
Task-number:QT-2757
Reviewed-by:andreas
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The effect might rely on a child to draw itself. So we need to redraw if
a child become visible or invisible.
Task-number:QTBUG-7843
Reviewed-by:janarve
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Before calling addItem we need to invalidate the depth otherwise if
someone call anything relating to sorting when itemChange is called
(because of the scene change for instance) then qt_closestItemFirst
for example can crash because of an invalid state.
Task-number:QTBUG-6932
Reviewed-by:janarve
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The pkg statements were generated in invalid order if user used
pkg_prerules to redefine languages supported by the pkg file.
Also made it possible to override dependency statements autogenerated
for Qt and QtWebkit, as these statements need to be user defined in
case of multiple languages.
Defining the following in .pro removes all dependencies from pkg rules:
default_deployment.pkg_prerules -= \
pkg_depends_webkit \
pkg_depends_qt \
pkg_platform_dependencies
Task-number: QTBUG-9279
Reviewed-by: Janne Anttila
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Compile fix
Changed Symbian pkg files to deploy from under epoc32
Remove internal custom pixel metric enums
Hotfix to const usage in 262e98f9a29385f99cd6f768632264e0b621dc01
Fixed S60 softkey implementation to use popup/modal dialog softkeys.
Fixed 'fullsreen with softkeys' mode not to expand under softkey area.
Fixed left softkey regression caused by 7829fe15 in Symbian.
QS60Style: Housekeeping
Custom pixel metric values cannot be inquired from outside the class
Adding custom pixel metrics requires cleaning and rebuilding of QtGui
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Commit 47902b7587d66c0941bacf08b31b8caae264f09a was missing one enum
rename in qs60style_s60.cpp
Reviewed-by: TrustMe
|
| | | | |\ \ |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-By: TrustMe
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Previously softkey implementation assumed that source for softkey
actions is focused widget or activewindow if there is no focused
widget. Since for example pop-up menu does not take focus immediately
in touch enabled devices, the underlying widget softkeys were visible
and usable when menu was open. This lead to problem that underlying
widget could be interacted via softkeys when popup menu was open.
For example as reported in QTBUG-8688, it was possible to close the
underlying filedialog from which the currently active context menu was
launched. It was also possible to open "Options" menu of underlying
widget when context menu was open, leading to situation where several
context menus could be launched via "Actions" item of "Options" menu.
This was reported as an issue: QTBUG-6167
In addition when user started navigating in context menu via keypad,
the menu got focus and softkeys changed to partially correct. Only
partially correct, since context menu "Select" action and "Options"
action had same priority and both associated to LSK. In addition the
context menu action "Cancel" associated to RSK was set to invisible,
meaning that it was also disabled and appeared in sofkeys as dimmed.
All of these issues were fixed by making making the popup and modal
dialogs highest priority softkey source. In case the focused widget
is inside popup or modal dialog it is being used as an initial softkey
source. In addition the softkeys created with
QSoftKeyManager::createAction or QSoftKeyManager::createKeyedAction are
now by default invisible i.e. not visible in context menu and have
special property set to make them still normally enabled in softkeys.
Task-number: QTBUG-6167
Task-number: QTBUG-8688
Task-number: QTBUG-9144
Reviewed-by: Sami Merila
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
availableGeometry returns incorrect area after cba is made invisible,
it seems that this happens because CAknToolbar is not made invisible.
Fixed the problem by reverting back to SetExtentToWholeScreen usage
when the widget is really fullscreen, i.e.
Qt::WindowSoftkeysVisibleHint is not set.
Task-number: QTBUG-9038
Reviewed-by: Miikka Heikkinen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Dialogs are always responsible for setting all of their softkeys by
themselves, that's why this qmenubar hack can be removed.
When "Options" menu support was moved from QMainWindow to QMenuBar,
it appeared that some dialogs did had "Options" in LSK even it should
have had dialog specific softkey.
This commit removes the year old hack made to qdialogs softkey
implementation.
Reviewed-By: Sami Merila
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Use only public custom pixel metrics. Remove the internal enum
and switch usage of those to public enum values.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Remove unnecessary #include, remove unnecessary integer, correct
spelling issues in comments and replace tabs with spaces.
Reviewed-by: Alessandro Portale
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is due that
a) custom values are internal and not exposed
b) values use different format - they are indexes for internal data[]
table and not according to QStyle documentation for pixel metrics.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
This is due that the size of the pixel metrics table is stored in some
object file and the file is not updated, even if we increase the table
size integer. Removing direct calls from internal methods to member
variable data[] removes the need to do whole rebuild when adding
values.
Relates to task #9247.
Task-number: QTBUG-9247
Reviewed-by: Alessandro Portale
|
| | | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Doc update for QSpinBox::textFromValue
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We remove the group separator so the docs should reflect this.
Reviewed-by: Donald Carr <donald.carr@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The focus frame was drawn with a low opacity. That was intended meant
to increase aesthetics but in reality decreased usability. Now,
the opacity is higher. But still with a difference between navigation
mode and edit mode.
Task-number: QT-826
Reviewed-by: Sami Merila
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
The QFocusFrame drawing code in QS60Style incorrectly assumed that
PM_LayoutSpacing is always equal to PM_FocusFrameMargin. When these
values diverged, the focus frame broke as described in task QTBUG-8036.
The fix makes the drawing more robust. The focus frame width is never
thicker than PM_LayoutSpacing and PM_FocusFrameMargin. And instead of
drawing a roundRect with calculated pen width, we are now filling a
roundRect. That makes the focusFrame more apparent.
Task-number: QTBUG-8036
Reviewed-by: Sami Merila
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix #ifdef logic for Symbian conversion functions in QVGPixmapData.
Fixed table formatting in QSound documentation
|
| | | | |/ /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Added the missing \row tag
Reviewed-by: TrustMe
|
| | | |\ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Recommit 1ebeb971d3382aec0fff927
Fixed inconsistent test naming.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This reverts commit 725c2c29c192349016b1332824a7716bbb992f31 which reverted
the original commit because of a test failure on qws. This recommit adds
a test for whether the metrics from QFontEngine::boundingBox() are valid,
which is required for the bearings to be calculated. This test was also
in the original logic.
|
| | |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
We are now checking that the QAction is not related
to the About or Quit button on Mac OS X
Task-number: QTBUG-7540
Reviewed-by: Morten Sorvig
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Morten Sorvig
|
| | | | | |
|
| |\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | | |
Conflicts:
demos/declarative/minehunt/minehunt.cpp
src/declarative/qml/qdeclarativecompiler.cpp
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
|
| | |\ \ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Conflicts:
tests/auto/declarative/qdeclarativedom/data/importlib/sublib/qmldir
|
| | |\ \ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (26 commits)
Use canonical form for headers
Remove exporting of QDeclarativeContext class symbols
Remove non-existing header from pri file
Fix Loader crash.
Compile in namespace
Deprecate inline Script {} blocks
Update metaobjectbuilder version test.
Set role names for QFileSystemModel and QDirModel
Removed wrong parenthesis around property NOTIFY declaration
Remove dead performance measurement code from QML
Fix warning mentioned in the comments of QTBUG-9182.
Fix test.
Ensure positioner animations are triggered correctly
Fix qdeclarativeqt::createQmlObject autotest
Add MiddleButton = MidButton to MouseButtons enum.
Fix qdeclarativetextedit::delegateLoading autotest
Fix Behavior documentation due to easing changes.
Fix crash when calling createObject on a component with errors.
Initialize variable.
Produce an error when trying to create objects in a PropertyChanges.
...
|
| | | |\ \ \ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (24 commits)
Remove non-existing header from pri file
Fix Loader crash.
Compile in namespace
Deprecate inline Script {} blocks
Update metaobjectbuilder version test.
Set role names for QFileSystemModel and QDirModel
Removed wrong parenthesis around property NOTIFY declaration
Remove dead performance measurement code from QML
Fix warning mentioned in the comments of QTBUG-9182.
Fix test.
Ensure positioner animations are triggered correctly
Fix qdeclarativeqt::createQmlObject autotest
Add MiddleButton = MidButton to MouseButtons enum.
Fix qdeclarativetextedit::delegateLoading autotest
Fix Behavior documentation due to easing changes.
Fix crash when calling createObject on a component with errors.
Initialize variable.
Produce an error when trying to create objects in a PropertyChanges.
Fix Flipable crash.
Reduce amount of qmldir parsing
...
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-7479
Reviewed-by: Alexis Menard
|
| |\ \ \ \ \ \ \ \
| | |_|_|_|/ / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Four-way merge: take the qt-qml.git#4.7 branch version (which uses
fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1.
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
It follows the GNOME HIG as specified in
http://library.gnome.org/devel/hig-book/stable/controls-lists.html.en
Ammending commit reversion fad919fa0fe976facc94685fd1460b4961b72c4e.
Reviewed-by: jbache
Task-number: QTBUG-9299
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit 74ce3dea8b3ea06d61cef4e729f6a95f670461fe.
The sorting order is intentional.
|
| | |\ \ \ \ \ \ \
| | |_|_|_|/ / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fix warnings in the declarative module
compile fix for mingw (also removes some warnings)
Sort indicators displayed incorrectly in GTK style
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Reviewed-by: Thierry
Task-number: QTBUG-9299
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QElapsedTimer doesn't initialise itself on construction, which means we were
actually depending on uninitialised data. QTime does initialise itself to NullTime.
This means the test didn't actually work if you ran it precisely at midnight...
Reviewed-By: Trust Me
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
The NONCLIENTMETRICSW::iPaddedBorderWidth member is supported only on
Windows Vista and above. So when calling the SystemParametersInfo
for SPI_GETNONCLIENTMETRICS on Windows XP, the size for that member
needs to be removed from NONCLIENTMETRICSW::cbSize.
Task-number: QTBUG-8639
Reviewed-by: Thierry
|
| |\ \ \ \ \ \ \ \ |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
When QWidget::activateWindow() is called we check if the window was already
mapped and just do not do anything if it wasn't. We used to try to active it
by giving it keyboard focus, but that always fails because it isn't allowed to
call XSetInputFocus on invisible windows, and the error message was swalled by
Qt in the error handler. So now we just don't bother even trying if we know the
call will fail.
Task-number: QTBUG-4042
Reviewed-by: Benjamin Poulain
Reviewed-by: Bradley T. Hughes
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
If a window has X11BypassWindowManager hint, we shouldn't bother asking the
windowmanager to active it using the _NET_ACTIVE_WINDOW protocol and just go
though Xorg directly.
Reviewed-by: Bradley T. Hughes
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
This reverts commit 555175f9d9e5633b8fcfd6e6f6a11c84faa9946e.
|
