| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\ |
|
| | | |
|
| | | |
|
| | | |
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fixed copy-paste error in htmlgenerator.cpp
Corrected filename case for wincrypt.h
Add qDebug() operator for QGLFormat
Fix conversion between JavaScript Date and QDateTime
Avoid memory allocation when converting from Gbk to unicode.
Warn if surface creation fails
Doc: fixing search bug
doc: Added more DITA output to the XML generator
QSemaphore::tryAquire(timeout) -- never times out on an active semaphore
Fix warnings in QSslSocketPrivate::systemCaCertificates()
doc: Added more DITA output to the XML generator
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fixes:
htmlgenerator.cpp:1893: error: stray ‘\’ in program
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The case doesn't matter when building on Windows, but does
when cross-compiling on Unix.
Merge-request: 709
Reviewed-by: Andreas Kling <andreas.kling@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Very handy to trace GL issues on a device with broken gdb
Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use JavaScriptCore's conversion functions rather than our own
(incomplete) implementation.
Specifically, this means daylight saving time is finally
handled correctly on Windows.
Task-number: QTBUG-9770
Reviewed-by: Olivier Goffart
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
This change is the equivalent of
19e1b32bdeeeb5c7865038cab97b40dbac0e6c42 and
987458462994497f764baf253baca0faabdb63cc but for the Gbk case.
It improve performance by avoiding the constructor of QChar and
by allocating the memory once instead of doing it for each
character.
This also fix QTBUG-11704.
Reviewed-by: Andreas Kling
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Output the same warning that qegl.cpp does also in the X11
implementation.
Reviewed-by: Trond Kjernåsen <trond.kjernasen@nokia.com>
|
| | | | | |
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If a thread trying to acquire multiple resources is continuously
preempted by threads acquiring smaller amounts, the larger consumer
would end up waiting forever (instead of for the given timeout).
Fix this by keeping track of elapsed time between wakeups using
QElapsedTimer.
Task-number: QTBUG-11500
Reviewed-by: thiago
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Markus Goetz
|
| | | |/ /
| | | |
| | | |
| | | |
| | | |
| | | | |
Output the \variable stuff as a cxxVariable.
Task-number: QTBUG-11391
|
| | | |\ \ |
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Output Q_PROPERTY as a cxxVariable.
Task-number: QTBUG-11391
|
| | |\ \ \ \
| | | |/ /
| | |/| |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Use custom static scopes to improve QML/JavaScript performance
qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
This commit introduces a new internal JS object type,
QScriptStaticScopeObject, that enables the JS compiler to make
more aggressive optimizations of scoped property access.
QScriptStaticScopeObject registers all its properties in a
symbol table that the JS compiler has access to. If the compiler
finds the property in the symbol table, it will generate the
fast index-based op_{get,put}_scoped_var bytecodes, rather than
the dynamic (slow) op_resolve and friends.
If the compiler _doesn't_ find the property in the symbol table,
it infers that it's safe to skip the scope object when later
resolving the property, which will also improve performance
(see op_resolve_skip bytecode).
QScriptStaticScopeObject is only safe to use when all relevant
properties are known at JS compile time; that is, when a
function that has the static scope object in its scope chain is
compiled.
It's up to the user of the class (e.g. QtDeclarative) to ensure
that this constraint is not violated.
The API for constructing QScriptStaticScopeObject instances is
not public; it lives in QScriptDeclarativeClass for now, an
internal class exported for the purpose of QML. The instance is
returned as a QScriptValue and can be manipulated like any
other JS object (e.g. by QScriptValue::setProperty()).
The other part of this commit utilizes QScriptStaticScopeObject
in QtDeclarative in the two major places where it's currently
possible:
1) QML disallows adding properties to the Global Object.
Furthermore, it's not possible for QML IDs and properties to
"shadow" global variables. Hence, a QScriptStaticScopeObject
can be used to hold all the standard ECMA properties, and this
scope object can come _before_ the QML component in the scope
chain. This enables binding expressions and scripts to have
optimized (direct) access to e.g. Math.sin.
2) Imported scripts can have their properties (resulting from
variable declarations ("var" statements) and function
declarations) added to a static scope object. This enables
functions in the script to have optimized (direct) access to
the script's own properties, as well as to global properties
such as Math.
With this change, it's no longer possible to delete properties
of the Global Object, nor delete properties of an imported
script. It's a compromise we make in order to make the
optimization safe.
Task-number: QTBUG-8576
Reviewed-by: Aaron Kennedy
Reviewed-by: Olivier Goffart
Reviewed-by: Jedrzej Nowacki
|
| | | |\ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
qmake: Fix CONFIG += exceptions_off with the MSVC project generator, take 2.
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The previous patch caused the pch header to be compiled without exception
handling since the compilertool for the pch compilation do not get
its options filled from the compiler flags.
This patch instead set the value to off before calling parseOptions.
This also reverts commit 73fa311f67b21c9b897de0196d3b8227f27d828f.
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
| |\ \ \ \ \
| | |_|_|/
| |/| | | |
|
| | |\ \ \ \ |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | | |
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Task-number: QTBUG-11222
|
| | | |\ \ \ \ |
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QML will now invoke methods with enums as arguments, in the same fashion
as QtScript.
QTBUG-11313
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-11283
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-11507
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-11600
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-11605
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
QTBUG-11606
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-11222
Reviewed-by: Aaron Kennedy
|
| | | |/ / / / |
|
| | | | | | | |
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix import path in cppextensions declarative example.
Update tests following QDeclarativeFlickable::viewport() -> contentIem()
Prevent value source animations from being registered to start twice.
Make compile.
More script benchmarking.
Expose the Flickable's internal contentItem
Script benchmarking.
Update lupdate to recognize concatenated text in QML files.
Ensure sourcesize is in pixmap cache key.
Use ugly but reliable bitmaps fonts in test.
doc: note that calling methods before component completion may have no effect
Fix unstable qdeclarativeviewer tests
Use Pen with Qt::MiterJoin when drawing Rectangles with gradients
Update screenshot
Fix and better test Text / TextEdit alignments.
Ensure the view is correctly positioned at component complete.
Support for non-literal plural arguments to qsTr() in lupdate (QML).
References to undefined variables throws a ReferenceError
|
| | | |\ \ \ \
| | | |_|/ /
| | |/| | |
| | | | | |
| | | | | |
| | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-webkit:
Updated WebKit to 2f598e9b7b376d851fe089bc1dc729bcf0393a06
Moved the QML WebKit integration into QtWebKit.sis
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
* Fixed QML packaging
|| <https://webkit.org/b/39304> || Add an inlineCapacity template parameter to ListHashSet and use it to shrink the positioned object list hash set. ||
|| <https://webkit.org/b/39309> || Allocate the m_preloads list hash set dynamically and free it when done. ||
|| <https://webkit.org/b/33150> || Do not render the full frame when there is some elements with fixed positioning ||
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Janne Koskinen <janne.p.koskinen@digia.com>
|
| | | |\ \ \ \
| | | |/ / /
| | |/| | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Manipulate buffer position via 'pPos' in peek()
No more enter & leave events after a popup menu is closed on Windows
Child windows shown automatically when their parent is shown(Cocoa).
QKeyEvent::text() inconsistency between Linux and Mac
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
We use the TrackMouseEvent() to keep track of enter and leave messages.
Upon receiving a WM_MOUSELEAVE, the effect of that function call is over,
we need to call it again if we need more messages. This was not done when
we close a popup because of mouse click outside.
Task-number: QTBUG-11582
Reviewed-by: Bradley T. Hughes
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
While setting up the stacking order for child windows, their hidden state
was never taken into consideration.
Task-number: QTBUG-11239
Reviewed-by: Richard Moe Gustavsen
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
For a key event triggered by the cursor keys, QKeyEvent::text() returns
char with value 0x14 or similar. This patch (Cocoa only)will remove
text from all key events for the unicode range 0xF700-0xF747. This is
part of the corporate unicode range used by apple for keyboard function keys.
[http://www.unicode.org/Public/MAPPINGS/VENDORS/APPLE/CORPCHAR.TXT]
Task-number: QTBUG-11225
Reviewed-by: Bradley T. Hughes
|
