| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure
mkspecs/common/symbian/symbian.conf
mkspecs/features/symbian/application_icon.prf
qmake/generators/makefile.cpp
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake.cpp
tools/assistant/tools/assistant/assistant.pro
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
qmake/generators/symbian/symmake.cpp
tests/auto/qlineedit/tst_qlineedit.cpp
tests/benchmarks/benchmarks.pro
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The bug happened when a paint event came in from Symbian, but the
painted area was bigger than the exposed rect being passed in by
Symbian. In these cases we would lose updates to the area outside.
Fixed by calling Draw() once more if we detect that we painted a
larger area to the backing store.
It is still a mystery why this worked on 5.0 though... :-P
AutoTest: QWidget passed
RevBy: Jason Barron
Task: QTBUG-8200
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Very recent change for QS60Style breaks compilation of the style for
3.1. This is due to that style refers to a skin item ID that is not
existing on 3.1 environment. Fixed by referring to the skin ID with
its internal values.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix for QTBUG-7258 make itemview margins larger. This broke the
treeviews visually, as indicators are not shown in correct places.
Now, indocators are placed correctly for treeviews as well.
Task-number: QTBUG-7995
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fix for QTBUG-8193 introduced a new enum value into s60style.
Unfortunately, the comma after the value didn't make it into the fix
itself. Adding the comma to allow compilation of style.
Task-number: QTBUG-8193
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
QS60Style uses non-square area for scrollbar end graphics areas. It
then tries to scale the areas to make them look like native graphics
(and keeps the width-height ratio), thus squeezing them.
Change style so that scrollbar end areas are squares, just like in
native graphics they are.
Task-number: QTBUG-7996
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When Drag-n-Dropping elements in itemviews QS60Style draws drop area
as a black rect. Change this so that native graphics are used instead.
This change only affects touch-devices as non-touch 3.x devices
do not have the native graphics defined. In 3.x non-touch devices,
style still uses QCommonStyle to draw the DropArea.
Task-number: QTBUG-8193
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently style does not forbid scrollbar context menu, so by default
long pressing over the scrollbar widget shows the context menu. This is
not according to 'S60-style', so from now on the stylehint
SH_ScrollBar_ContextMenu returns false.
Task-number: QTBUG-8194
Reviewed-by: Alessandro Portale
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Currently when calculating a button content size, QS60Style has a
variable called buttonWidth, which actually is the width of the
content, not the button itself. Change this to buttonContentWidth.
Reviewed-by: TrustMe
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
qmake - add targets to wrapper make file
make stub_sis
createpackage - use -s or --stub to run makesis with the -s argument
also copies the file to the right place in epoc32\data\system\installs
qt.iby - add qt_stub.sis and qt_webkit_stub.sis
Task-number: QTBUG-6570
Reviewed-by: Miikka Heikkinen
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix to S60 softkeys when no active Qt window or native widget is shown.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Softkeys need to be updated also when Qt activewindow is set to NULL,
this is needed that usecase where last Qt widget is closed works
correctly. I.e. closed widget softkeys has to be removed, and replaced
by default "Exit" softkey. Earlier only window activation or widget
focusIn event caused softkey update.
In addition IsDisplayingMenuOrDialog does not work correctly under all
circumstances. Sometimes when menu is being launched the Qt gets
focusChanged event before the menu is actually shown, but menu CBA is
already created. This is fixed by checking that we update CBA only when
AppUi CB is the current one. This assumption works as long as Qt uses
only the CBA created by S60 application framwork and does not create
other CEikButtonGroupContainer instances.
Task-number: QTBUG-6115
Reviewed-by: Sami Merila
|
| | | |\ \ |
|
| | | | | | |
|
| | | |/ /
| | | |
| | | |
| | | | |
Task: QTBUG-7997
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Task: QTBUG-5892
RevBy: Trust me
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enabled searching of IM plugins on Symbian.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
- It will try hbim and coefep first.
- If both are missing (coefep can only be missing if compiled without
S60 support), other plugins in the inputmethods plugin directory
are attempted.
Task: QT-2460
RevBy: Sami Merila
|
| | |\ \ \ \
| | |/ / /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3410 commits)
Compile fix for OSX.
Make compile. QmlMetaType::isObject() has changed to isQObject().
Fix warnings
Reference count shared expression data
Cleanup public QmlMetaType API
Fix case sensitivity bug in previous commit
Adds inputMethodHint property to TextEdit and TextInput.
Decouple Loader from QmlGraphicsItem
Make test more stable.
Fixed race condition in tst_qmlgraphicswebview::multipleWindows
Explicitly pass size to standard pixmap icon loaders.
Fix qmlgraphicswebview:pixelCache autotest by setting defaults on html
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
...
|
| | | | | | |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QmlExpression uses data from the QmlCompiledComponent (eg. expression
string data). It must therefore hold a reference to the
QmlCompiledComponent to prevent the data being deleted.
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Remove some unnecessary methods from the QmlMetaType class
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Martin Jones
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Task-number: QT-2823
Reviewed-by: Aaron Kennedy
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If no size is passed the pixmaps will always be loaded to determine the
size, wasting memory. This change allows the pixmaps to be loaded lazily.
Reviewed-by: jbache
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3398 commits)
Fixed compile of these recently renamed tests.
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Fix BorderImage tests on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Clean up
Must pass app arguments onto qExec() or else test system cannot
QML Object toString should use 64-bit address on 64-bit platforms
Improve stability of tst_qmlecmascript::dynamicDestruction
Fix tst_qmlecmascript::callQtInvokables
Fixed qmldebug* tests crashing.
Fix declarative/qmldom::loadDynamicProperty autotest
Fix declarative/animatedimage autotest
Removed the tests/auto/declarative/visual(&examples) from .pro
...
|
| | | | |\ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3397 commits)
Update QmlChanges.txt
Adds qml prefix to all declarative autotests
Removed "running: true" for animations used as propertyvaluesource
Animations are running by default when used as property source value
Fix QmlEngine offlineStoragePath test.
Fix Image test on Windows.
Fix FontLoader test on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Fix BorderImage tests on Windows.
Test should use ceil() not floor() since ceil() is used for calculating
Clean up
Must pass app arguments onto qExec() or else test system cannot
QML Object toString should use 64-bit address on 64-bit platforms
Improve stability of tst_qmlecmascript::dynamicDestruction
Fix tst_qmlecmascript::callQtInvokables
Fixed qmldebug* tests crashing.
Fix declarative/qmldom::loadDynamicProperty autotest
Fix declarative/animatedimage autotest
Removed the tests/auto/declarative/visual(&examples) from .pro
Add EXPECT_FAIL to js parser tests in declarative ui
...
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
When you assign an animation to a property (used as source value),
the animation will automatically start running, which is the most
common behavior for this use case.
Reviewed-by: Michael Brasser
|
| | | | | | | | |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The assert in qmlobjectscriptclass.cpp is valid when the call is running
in a correctly created QML environment, but not valid for the test case
which bypasses QML.
|
| | | | | |\ \ \
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits)
Expect fail.
Expect fails.
Attempt to clairify highlight range docs
Make sure item release isn't deferred indefinately
Expect fail.
Missing file
Exclude plugins example in test.
Test
Crash
Fix tests
Compile.
Remove pathview test.
Remove unneeded
Fix repeater test.
Revert "Remove unimplemented methods from header"
Revert "Replace QList<>* support with QmlListProperty"
Revert "Compile"
Add expected fail and created QTBUG-8072 for qml animation auto-test
Fix expected error message.
Consolidate the two pathview tests and fix them all.
...
|
| | | | | | |\ \ \ |
|
| | | | | | | | | | |
|
| | | | | | |/ / / |
|
| | | | | | | | | |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit e712ecee850e04084643243a096befbf47e4e8b9.
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
This reverts commit d914555badcd4761864657e1e335e657b791453f.
|
| | | | | | | | | |
|
| | | | | | |\ \ \
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits)
Get test compiling
Remove unimplemented methods from header
Properly insert objects into the context's object list
Missed a file
Compile
Replace QList<>* support with QmlListProperty
Remove old implicit module support.
Use networkAccessManagerFactory() for worker threads too.
Connect to localhost instead of QHostAddress::Any. Fixes test on Windows.
Support the other validators
Add empty constructor for validators.
Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType
Document QtObject
Changed define name to reflect change in Creator.
re-enable QT_USE_FAST_CONCATENATION
XMLHttpRequest collection bug
For local fonts, we can just addApplicationFont() rather than loading data.
The virtual keyboard is now working for TextEdit and TextInput components.
Fix viewport size update.
Make transformOrigin Center by default
...
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Implementations got removed in d914555badcd4
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Fixes a failing autotest, where the object's context pointer was not
being reset. This was because the object was not placed properly in the
context's contextObjects list and so was not found and cleared when the
context was destroyed.
|
| | | | | | | | | | |
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Previously, it was allowed to use type qualification to refer to types
defined in subdirectories - indeed, this was the only form of modularity.
This is no longer desirable since we have good import features.
Task-number: QTBUG-7721
|
| | | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Task-number: QT-2850
|
| | | | | | | |\ \ \ |
|
| | | | | | | | |\ \ \ |
|
| | | | | | | | | |\ \ \
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3342 commits)
Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType
Changed define name to reflect change in Creator.
re-enable QT_USE_FAST_CONCATENATION
XMLHttpRequest collection bug
The virtual keyboard is now working for TextEdit and TextInput components.
Fix viewport size update.
Make transformOrigin Center by default
Better documentation of "model" and "modelData" in delegates.
clip if tile mode is 'PreserveAspectCrop' and 'clip' property is true.
Fix test.
Allow objects to be shared between QmlEngines
Use QUrl::fromLocalFile() instead of "file://" (i.e. only 2 slashes).
Fix item removal.
Fixes: make qt-creator compile
Make atBeginning/viewArea calculations account for min extent.
Fix private header include.
Fix autotest.
Fix test.
Fix test.
Remove hacky fix (breaks autotest).
...
|
| | | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | |
| | | | | | | | | | | | |
We need some internal stuff in the derived class.
Reviewed-By: Kai Koehne
|
