| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
| |
Task-number: QTBUG-15409
Reviewed-by: Andrew Den-Exter
|
| |\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Prevent compilers optimizing eval timebomb code out of existence.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The variable that holds the eval license key is a placeholder that is
patched during package installation. Unfortunately, for a non-final
package build, the placeholder is filled with nulls at compile-time and
a clever compiler will optimize away most of the eval timebomb code due
to a check in the eval code for the first character of the license key
being null.
This commit makes the variable that holds the license key volatile, to
convince compilers that they cannot make assumptions about the contents
of the variable when optimizing.
Task-number: QT-3848
Acked-by: Thiago Macieira
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix incorrect example for Qt.rgba()
Flickable and MouseArea were too eager to take/keep mouse grab.
Allow javascript date and regexp objects in WorkerScript messages
Avoid lockup in ListView when animating delegates.
Fix asynchronous reload call in test, broken by previous submit
Update QtGui emulator def file for bug QT-3971
Ignore .pc/
Ensure WebView press delay timer is cancelled when grab is taken.
Prevent crash when calling reload() from within a .qml
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab. This resulted
in a short jump before future events were handled by the nested item.
Task-number: QTBUG-15568
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-14666
Reviewed-by: Aaron Kennedy
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Animating delegates results in the content height changing, which
may result in fixup being called if at the ends of the view, which
may in turn cause refill to be called, which will change the content
height, which repeats. Prevent this recusion from happening.
Task-number: QTBUG-14821
Reviewed-by: Bea Lam
|
| | | |
| | |
| | |
| | | |
Task-number: QTBUG-15493
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | |
| | | |
Reviewed-By: Rohan McGovern
(cherry picked from commit 561a72c2568768f9adf34aa1077717f9311ce56d)
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Flickable steals the grab, but the timer was not stopped and the
keepGrab flag is set and the mouse grabbed. This means that the WebView
now has the grab and subsequent clicks on another element are ignored.
Task-number: QTBUG-15529
Reviewed-by: Joona Petrell
|
| | |\ \ |
|
| | | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-15493
|
| |\ \ \ \
| |_|_|/
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qthread: fix compilation
Round origin of text in OpenVG engine
QThread::exec(): Fix possibility to enter several time the event loop
QMessageBox: change the documentation to reflect that it is application modal
Compile on OpenBSD
Doc: Q_PROPERTY, implements the setter/getter in the example
Dynamically register the event number.
Fix wrong error assumption when converting "0.0" to double
|
| | |\ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
tst_qthread: fix compilation
Round origin of text in OpenVG engine
QThread::exec(): Fix possibility to enter several time the event loop
QMessageBox: change the documentation to reflect that it is application modal
Compile on OpenBSD
Doc: Q_PROPERTY, implements the setter/getter in the example
Dynamically register the event number.
Fix wrong error assumption when converting "0.0" to double
|
| | | | | |
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Round origin of text in OpenVG engine
QThread::exec(): Fix possibility to enter several time the event loop
QMessageBox: change the documentation to reflect that it is application modal
Compile on OpenBSD
Doc: Q_PROPERTY, implements the setter/getter in the example
Dynamically register the event number.
Fix wrong error assumption when converting "0.0" to double
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The origin of text needs to be rounded, just like the translation in
the transform because text drawn at subpixel positions is unsupported
on some devices. Since the font is integer-based, the advance-array
does not need to be rounded.
Task-number: QTBUG-15263
Reviewed-by: Jason Barron
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If one call exit() before calling exec(), this should prevent the
event loop from starting once, but later calls to exec() should work.
This is a regression against Qt 4.6 introduced when fixing QTBUG-1184
Task-number: QTBUG-15378
Reviewed-by: Joao
Reviewed-by: Brad
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
QMessageBox was documented to be window modal, but it is actually
application modal.
Changing the behaviour now would be dangerous, as QMessageBox reenter
the event loop.
So update the documentation.
Task-bumber: QTBUG-14499
Reviewed-by: Joao
Reviewed-by: Denis
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Fail to compile since f3405a516ac30fc7dee1
Reviewed-by: Joao
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Some developer thought the implementation of the getters and
setters needed to have some metaobject magic
Also add a NOTIFY signal in the example
Reviewed-by: Joao
|
| | | | | |
| | | | |
| | | | |
| | | | | |
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
The function qstrtod calls strtod without first resetting the errno
but verifying it nonetheless. This could lead to situations where
the errno was already set to ERANGE and hence it would mistakenly
assume the conversion could not be done right.
Merge-request: 2507
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit 759c0b5ecf84201f36d44b4e6c46da1886d85dee)
|
| |\ \ \ \ \
| |/ / / /
|/| | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
Doc: Fixing typo
QS60Style: Null pointer crash when using itemviews in some cases (pt2)
Fix code style
QS60Style: Null pointer crash when using itemviews in some cases
Fix the tests that got affected by the behaviour added in 604c51f1fc5c79
Improve performance of hfw in qgridlayoutengine by adding more caching.
Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
QToolbar should fill available width on Symbian
Adhere to code style
Some improvements to the docs that was added in merge request 894
Change the QGraphics*Layout documentation to match the code - that the default alignment is top-left.
Fix item alignment in layouts bigger than the items thay they contain
Add autotest to test a issue with stretches and preferred width.
Code style cleanup for merge request 847
Add back the tests that were removed by commit fcda1b785bd7d86011f49bfe96cb22b04202933f
Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58
|
| | | | | | |
|
| | |\ \ \ \
| | |/ / / |
|
| | |\ \ \ \
| | | |/ /
| | |/| | |
|
| | |\ \ \ \ |
|
| | | |\ \ \ \ |
|
| | | | | | | | |
|
| | | |/ / / /
| |/| | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Also remove accidentally added whitespaces.
Task-number: QTBUG-15455
Reviewed-by: TrustMe
|
| | |\ \ \ \ \
| | |/ / / / |
|
| | | |\ \ \ \ |
|
| | | | |\ \ \ \ |
|
| | | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
Task-number: QTBUG-13551
Task-number: QTBUG-7756
|
| | | |\ \ \ \ \ \
| | | | |/ / / /
| | | |/| | | | |
|
| | | | |\ \ \ \ \ |
|
| | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Due to somewhat questionable .pro-file flagging, the plugin is not
currently compiled at all for latest Sym^3 environments.
Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
upcoming platform versions change, this should work in the future.
Task-number: QTBUG-15428
Reviewed-by: Mikka Heikkinen
|
| | | | |/ / / / / /
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
Due to somewhat questionable .pro-file flagging, the plugin is not
currently compiled at all for latest Sym^3 environments.
Flagging is now more bulletproof (not 3.1 & not 3.2), so even if the
upcoming platform versions change, this should work in the future.
Task-number: QTBUG-15428
Reviewed-by: Miikka Heikkinen
|
| | | | |\ \ \ \ \ \ |
|
| | | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | |
| | | | | | | | | | |
Normally QStyle provides a minimum size for a widget. However, to
imitate native toolbar behavior, QToolBar should occupy available
screen estate on Symbian (with QS60Style). This is only supported
for horizontal QToolBars as native side does not have same
functionality for vertical toolbars.
QToolbar size now tries to take into account available size of
parent reduced by margins (if several parents, then each can reduce
the available space by their margins). Also, toolbar internal
pixel metrics data (item spacing, item margins) are taken into
account.
Task-number: QTBUG-13120
Reviewed-by: Janne Koskinen
|
| | | | |_|_|/ / / /
| | |/| | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | |
| | | | | | | | | |
The previous code tried to do caching of queries with constraints too,
but it's usecase was rather limited.
The caching worked for the simple case of
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1)); // uses cache
The problem was that if somebody called this sequence:
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(-1, -1));
effectiveSizeHint(Qt::PreferredSize, QSize(10, -1));
Each call would disregard the cache because the constraint was
different.
Now the pattern is used in the qgridlayoutengine itself when we
calculate hfw: (yes, height-for-width).
First, we ask for the horizontal size hints with no constraints.
Then, we'll ask for the vertical size hints with constraints.
Since horizontal and vertical ultimately comes from the same function
(effectiveSizeHint) it will invalidate the cache each time.
The solution is to add another cache for the sizeHints with
constraints.
The most notable improvement is in the hfw, nested case. Result:
RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
546 msecs per iteration (total: 546, iterations: 1)
RESULT : tst_QGraphicsLinearLayout::heightForWidth():"hfw, nested":
0.000029 msecs per iteration (total: 62, iterations: 2097152)
Improvement: 18,827,586 times faster (!!)
|
| | | |_|/ / / / /
| |/| | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | |
| | | | | | | | |
QS60Style attempts to use null pointer when drawing CE_ItemViewItem,
if the parameter widget is provided as null.
This leads to, for example, Chart example app crash in startup.
Reviewed-by: Janne Anttila
|
| | |\ \ \ \ \ \ \
| | |_|/ / / / /
| |/| | | | | | |
|
| | |\ \ \ \ \ \ \ |
|
| | |\ \ \ \ \ \ \ \
| | |_|_|/ / / / /
| |/| | | | | | | |
|
| | | | | | | | | | |
|
