| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Task-number: QTBUG-6716
Reviewed-by: Michael Brasser
|
| |
|
|
| |
QTBUG-9726
|
| |
|
|
|
|
|
|
|
| |
Mouse area coordinates are now updated when the mouse area changes position
and positionChanged signals are not emitted on mousePress anymore (only
mousePosChanged signals).
Task-number: QTBUG-9716
Reviewed-by: Michael Brasser
|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Recognize identifiers containing unicode escape sequences.
Fix README
Fix doc: QML_DECLARE_TYPE is no longer necessary
Fix doc: remote contents requires qmldir
Fixed parsing of inner labelled statements.
Doc
Remove unsupported plugin version flags in .pro files of declarative examples
Documentation typo.
More QML doc consistency.
Ensure existing image is gone before next photo selection.
Don't use zoomfactor.
Doc: in QML use "real" and "enumeration", not "qreal" and "enum"
Doc: Put "default" property label on same line as property name
Wait for debug clients asynchronously instead of blocking creation of
Test not reliable
ResizeMode support for QGraphicsWidgets created with QDeclarativeView
More class documentation fixes for declarative.
Simplify QML import plugin deployment lines
Add QML imports to s60installs.pro
Cleanup photoviewer demo.
...
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-8108
Reviewed-by: Olivier Goffart
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The JS grammar is ambigious and the following statement can be parsed
as an object-literal followed by an inserted semicolon or as two
labelled statements.
outer: {
inner: {}
}
In the old days we used to resolve the conflict by reducing the
statement to an expression statement but this was wrong so
now we prefer the labelled statement. As nice side effect, we
pass two more tests in tests/auto/declarative/parserstress.
Task-number: QTBUG-8108
|
| | |
| |
| |
| |
| |
| | |
the engine until a debug client has connected. This makes for easier
debugging from Qt Creator when debugging C++ and QML together and when
debugging an application that has multiple engines.
|
| | | |
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-8814
Reviewed-by: alexis
|
| | | |
|
| | |\ |
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-9949
|
| | |/
| |
| |
| | |
Task-number: QTBUG-7897
|
| |\ \
| |/
|/|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| | |
| |
| |
| |
| | |
there is really no point in marking them "unfinished". later file
rewrites would reset the state anyway.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
do that by ignoring all equal signs and everything between and
including brackets. this makes static initializers look
effectively like function definitions, thus creating proper
context.
Task-number: QTBUG-9276
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Add translation context to qsTr() benchmark
QtScript: Add autotest for enumeration of QMetaObject properties
QNAM HTTP: Pipelining changes
|
| | | |
| | |
| | |
| | |
| | | |
That's a more realistic case, since translations are usually
tied to a physical script.
|
| | | |
| | |
| | |
| | |
| | |
| | | |
The issue reported in QTBUG-3665 had been fixed since 4.6.0, but
it went unnoticed that there had been a bug in the first place
since there was no test for this behavior.
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM HTTP: Pipelining changes
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Re-wrote some code to improve pipelining efficiency. Greatly helps
with combining into one TCP packet.
Task-number: QTBUG-9894
Task-number: QT-3280
Reviewed-by: Peter Hartmann
|
| | | | | |
|
| | |\ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixes tooltips for QGraphicsProxyWidget.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Help event was not propagated to the widget. Also fixes tooltip value
propagation when setting it on the proxy or on the widget.
Autotest included.
Task-number: QTBUG-5349
Reviewed-by: bnilsen
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Previously, the MMF backend simply swallowed a call to pause() when in
StoppedState. However, the stopToPause step in tst_mediaobject requires
the backend to emit a stateChanged signal when this happens.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Many of the steps in the tst_mediaobject suite (a) check that the
MediaObject is in StoppedState at the start of the step and (b) call
stopPlayback() at the end. If, however, a QTest check fails during
the test, stopPlayback may not be called. This patch adds a call to
MediaObject::stop() in the suite's init() function.
This is a symptom of a wider problem with this test suite, namely that
it re-uses a single instance of Phonon::MediaObject for all steps. Given
the highly stateful nature of MediaObject, this can lead to test steps
failing due to some state which was erroneously carried forward from an
earlier step. While this test suite design may more faithfully
represent real-world usage of Phonon, it makes tracking down the root
causes of test failures needlessly difficult.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Test step was outputting ANSI escape codes in order to highlight
certain text. These codes are not natively supported by Windows
consoles, resulting in raw escape codes appearing in the output.
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This step previously did not guarantee that the m_media object
would be left in StoppedState, which in turn meant that following
test steps could fail.
Task-number: QTBUG-9339
Reviewed-by: Frans Englich
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Compiler warnings concerned unreachable code.
Reviewed-by: Frans Englich
|
| | | |/
| |/|
| | |
| | |
| | |
| | | |
Removed declaration of variables which are subsequently unused.
Reviewed-by: Frans Englich
|
| | |\ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( be2489a618c909c4a82d927f9fff9d12feafeb30 )
QtScript: Add tests for translation of multiple scripts
QtScript: Add test for translation disambiguation
QtScript: Fix call stack issue with qsTr() when JIT is enabled
|
| | | |
| | |
| | |
| | | |
Suggested by Olivier.
|
| | | | |
|
| | |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
commit c638ddc70f6a8196f2c8b11808ab01510233a0ee
Author: Lars Knoll <lars.knoll@nokia.com>
Date: Wed Apr 14 17:01:49 2010 +0200
Fix a bug in malayalam shaping
See http://bugreports.qt.nokia.com/browse/QTBUG-1887.
We were not finding the base character correctly in the case
where the syllable contained a ZWJ.
In addition, the indic OT specs require us to also apply the 'loca',
'cjct' and 'calt' features. They seem to be mostly unused by todays
fonts, but we should better apply them anyways.
Task-number: QTBUG-1887
Reviewed-by: Eskil
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | | |
4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QAbstractScrollArea StyleSheet: fix drawing of border with SH_ScrollView_FrameOnlyAroundContents
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
SH_ScrollView_FrameOnlyAroundContents
- Since Qt 4.6.0, the frame is drawn by PE_Widget, but there we do not take
in account the scrollbar for the case where SH_ScrollView_FrameOnlyAroundContents
is true.
- We also reserved too much space for the border, as we included the
native border as well in the computation, so do not reserve additional
space by setting PM_ScrollView_ScrollBarSpacing to 0
Task-number: QTBUG-9821
Reviewed-by: jbache
|
| | | |
| | |
| | |
| | | |
And fix two silly typos in the error messages.
|
| |\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Small calculator fix.
Improve declarative calculator example.
Update examples autotest to use the runtime directly
Support valuetypes as method return values
Compile without Qt3 support.
Doc
Simplify dynamic resource loading to avoid cluttering Text API.
Add Component.onDestruction attached property
Use qmlInfo for image loading errors, not qWarning().
Visual test updates.
Rename section so that it's not linked to by references to "JavaScript"
Doc improvements
Comments
Remove unused parameter
Correctly resolve, and load, IMG tags in Text element.
Rename "sql" test so autotester doesn't get confused.
Should work now, don't skip.
ignore autotester logs
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Rename QDeclarativeData -> QAbstractDeclarativeData
...
|
| | |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Small calculator fix.
Improve declarative calculator example.
Update examples autotest to use the runtime directly
Support valuetypes as method return values
Compile without Qt3 support.
Doc
Simplify dynamic resource loading to avoid cluttering Text API.
Add Component.onDestruction attached property
Use qmlInfo for image loading errors, not qWarning().
Visual test updates.
Rename section so that it's not linked to by references to "JavaScript"
Doc improvements
Comments
Remove unused parameter
Correctly resolve, and load, IMG tags in Text element.
Rename "sql" test so autotester doesn't get confused.
Should work now, don't skip.
ignore autotester logs
Rename the ridiculous QDeclarativeDeclarativeData -> QDeclarativeData
Rename QDeclarativeData -> QAbstractDeclarativeData
...
|
| | | | | |
| | | | |
| | | | |
| | | | | |
This improves the test execution time
|
| | | | | |
| | | | |
| | | | |
| | | | | |
QTBUG-9818
|
| | | |\ \ \ |
|
| | | | |\ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This property complements Component.onCompleted. It is emitted before
the destruction actually begins (for the most part) so the objects are
still alive and accessible.
The QtObject.onDestroyed signal is now blocked as it never really worked
properly anyway.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-9900 QT-3287
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | | |
|
| | | | | | | | |
|
| | | |/ / / /
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9908
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-9900
Reviewed-by: Martin Jones
|
| | | | | | | |
|
