| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Cocoa: fix crash when using a drawer with a focus widget
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The crash happends when you close down an application that has a
drawer that contains a widget with keyboard focus. The NSView
backing this widget is then the first responder in Cocoa.
This bug was a bit more hard-boiled than usual, and I can't say I truly
understand whats going on. My findings are that both the drawer and the
parent window both points to the same view inside the drawer as its
first responder. And when deleting the drawer (togheter with the focus
widget), the parent window is left pointing to a first responder that
is actually deleted. Is seems that us refusing to release a view as first
responder if we have no attached widget is wrong. So we choose to return
YES instead, which after all makes much more sense.
Task-number: QTBUG-15897
Reviewed-by: msorvig
|
| |\ \
| |/
| |
| |
| | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team:
Fix crash in KPackageKit
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
QTreeViewPrivate::itemHeight() may refer to an invalid QModelIndex
after calling QTreeView::indexRowSizeHint().
Same thing inside QTreeView::indexRowSizeHint(), since
QHeaderView::count() will call
QAbstractItemViewPrivate::executePostedLayout() which may invalidate
all the QModelIndex.
Reviewed-by: Olivier
Task-number: QTBUG-16292
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* '4.7' of git://scm.dev.nokia.troll.no/qt/qt-water-team: (84 commits)
Use QML notation for documenting TextInput::accepted() signal.
Document the TextInput accepted() signal.
Fix inheritance of widget input contexts.
Fix for ARMV6 drawhelper blending
Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
Worked around a SC issue in S60 3.x vs 5.0 versions.
Don't leak ScopeChainNode's
Designer: Slots of main container not visible in signal/slot editor.
Apply the gcce link rules for LIBS_PRIVATE too.
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
My 4.7.2 changes
Fix QFileDialog Symbian native file dialog filename filtering.
fix QMAKE_COPY_DIR for mingw+sh
...
|
| | |\ |
|
| | | |\
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Use QML notation for documenting TextInput::accepted() signal.
Document the TextInput accepted() signal.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use the name onAccepted() and refer to it as a handler rather than
a signal.
Change-Id: Ibd4144aa809e6d9db136187a07e9a660afa5df1b
|
| | | | |
| | | |
| | | |
| | | | |
Change-Id: I30a36ba2724c9641e9cfe5ceafa651728907ef63
|
| | | |\ \
| | | |/
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Fix inheritance of widget input contexts.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If a parent widget has an input context assigned return that from
QWidget::inputContext() before returning QApplication::inputContext().
Change-Id: I4982a91ace9b7485534f1c31fa4e2d549482640e
Task-number: QTBUG-17390
Reviewed-by: axis
|
| | | |\ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for ARMV6 drawhelper blending
|
| | | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Asm code used wrong source register when doing
constant alpha blending.
Task-number: QTBUG-16008
Reviewed-by: TRUSTME
|
| | | |\ \ \
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QStyleSheetStyle: dont crash in PE_WIDGET when widget is null
|
| | | | | | |
| | | | | |
| | | | | |
| | | | | |
| | | | | | |
Reviewed-by: Gabriel
Task-number: QTBUG-15910
|
| | | |\ \ \ \
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Keep sending posted events after commit 7196045b78b33cf135683d5c0b4e164f95231791
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
This commit put in place a timer based mechanism to ensure that posted
events continue to be sent. As pointed out in commit
eb1015c7bbf135af3656110a4d112377c1209db8, GetQueueStatus() can indicate
that there are messages in the queue but our hook never actually
receives them, hence the timer solution.
However, having the message type and hwnd "guards" in the conditional
for starting a timer would cause us to lose events in some situations,
due to the fact that QEventDispatcherWin32::processEvents() will only
allow one WM_QT_SENDPOSTEDEVENTS message per call (multiple messages
will be compressed into a single one). When racing with other threads,
it would be possible to end up blocking one thread that has pending
posted events unintentionally.
This fix removes the guards and makes sure that we start the keep alive
timer when it's really needed, and only stops it when we really know
that there is nothing left in the Windows message queue.
Task-number: QTBUG-17014
Reviewed-by: joao
Reviewed-by: Marius Storm-Olsen
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Worked around a SC issue in S60 3.x vs 5.0 versions.
Apply the gcce link rules for LIBS_PRIVATE too.
Build Qt with GCCE 4.4.1, Symbian^3 PDK on Linux and Mac OS X.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task: QTBUG-16578
RevBy: Gareth Stockwell
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
It's needed by building QtOpenGL of Qt for Symbian on Linux and Mac with gcce at least.
RevBy: axis
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Remove the define of _STLP_NO_EXCEPTION_HEADER after OpenC team's suggestion.
Remove the hardcoded include path for openc, it is already provided by mkspecs/features/symbian/platform_paths.prf.
RevBy: Miikka Heikkinen
Backport from 7c12d841fb2e2963b506c1ffc857cdd88bf78f6c in master.
|
| | | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't leak ScopeChainNode's
Rename 'plugins\qmldebugging' (work around qmake issues)
Correct the "module not installed" error handling
Flickable uses the flick velocity to determine whether to retain grab
Make addImportPath() work for windows paths starting with lower case
Report any exceptions occurring in WorkerScript javascript code
MouseArea docs - link to onCanceled() from onReleased()
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Create a sub-scope of the global scope chain, rather than a completely new scope
chain. Leaks are difficult to autotest, but an autotest for
QScriptDeclarativeClass::pushCleanContext() was added to ensure its behavior doesn't
regress. To reproduce the leak (prior to this change) use:
while (true) {
QScriptDeclarativeClass::pushCleanContext(&engine);
engine.popContext();
}
Change-Id: I41ac61ea1664da569eb329c8276f2a0bb6d2f1f7
Task-number: QTBUG-17166
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
On Windows, qmake places the tcpserver.dll in a 'plugins\qmlreleaseging'
folder, which broke remote debugging of QtDeclarative completely. New name
'qmltooling' while being not so specific, avoids the use of 'debug' in the folder name.
Task-number: QTBUG-17360
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
The not installed error will be issued if, after loading plugins and considering
the contents of qmldir, there are no elements in the particular minor version.
For example, if a plugin/qmldir provides the following types (either from C++ or
as QML files specified in the qmldir file):
Foo 1.1
Bar 1.3
importing versions 1.0, 1.2, or 1.4 will fail with the not installed error.
Change-Id: I8566fda6918cb48936144e67a1ce75add0f160d8
Task-number: QTBUG-17324
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Flickable keeps the mouse grab if it was recently flicked and another
flick is started before it has settled. However, it is using the
velocity of the flick rather than the instantaneous velocity of the
view, which causes it to be grabbed unless the view has come to a
complete stop. Use smoothedVelocity which is updated during the view
movement. Also increase the threshold a little.
Change-Id: I970318680d38103468155fa566c489c7874d1b00
Task-number: QTBUG-17383
Reviewed-by: Michael Brasser
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Was causing assert failure on windows if the 'c:' was lower case,
since it was being added to the import path database with a lower
case and thus later lookups with an upper case 'c:' would fail.
This change fixes the check for whether the path refers to a
local path or not.
Task-number: QTBUG-16885
Change-Id: I0a2a2f705443ed453fb2b13f8599e035c2bd2877
Reviewed-by: Martin Jones
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17183
Change-Id: I709cca0bdce247ca9250c4f334654e2ff57b0b32
Reviewed-by: Aaron Kennedy
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Designer: Slots of main container not visible in signal/slot editor.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Fix a regression introduced by dd7873cd7e02e42b384709f33a34f69bc06fb25d
of QTBUG-17179.
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Task-number: QTBUG-17358
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
|
| | | | |\ \ \ \ |
|
| | | |\ \ \ \ \ \
| | | |/ / / / /
| | | | / / / /
| | | |/ / / /
| | |/| | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
My 4.7.2 changes
|
| | | | | | | | |
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QFileDialog Symbian native file dialog filename filtering.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Now QFileDialog static functions that use Symbian native file dialog
should find the same files as non-native QFileDialog for any given
filename filter.
Task-number: QTBUG-17298
Reviewed-by: Janne Koskinen
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix QMAKE_COPY_DIR for mingw+sh
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Task-number: QTBUG-17315
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
PathView items were not correctly updated when rootIndex changed.
Allow text to selected in a TextEdit or TextInput inside a Flickable.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
PathView got confused because it queried the model when removing
items due to the rootIndex change. This caused new items to be added
since the model->count() was not zero (it was the count for the new
rootIndex). Calculate the PathView modelCount similarly to the other
views (rather than querying the model) and correctly handle the
modelCount being set to zero.
Change-Id: I9e4fb27c14aa8c77ad37ff01d95c123f909db20d
Task-number: QTBUG-16366
Reviewed-by: Bea Lam
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Set keepMouseGrabs to true when the selectByMouse property is enabled
to prevent flickable from stealing the mouse grab and interrupting
a selection.
Change-Id: I08e11265ab9c55d239fd09aceef4fdb8e74aba9d
Task-number: QTBUG-16956
Reviewed-by: Martin Jones
|
| | | |\ \ \ \ \
| | | |/ / / /
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Update modules-related tests and docs
CLeanup registers after AddString
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added tests for remote imports and fixed/improved examples and
text in the docs.
Change-Id: I8f411a0287c4d50ec3cebe5567d803689cd5b1c7
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: Martin Jones
Change-Id: I7bd2806770fe5b86fbc589644107d74981d32abe
|
| | | |\ \ \ \ \
| | | | |/ / /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Stop focus propagation of touch events when flag is set.
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Added check to stop propagation of touch events for items that
have the QGraphicsItem::ItemStopsClickFocusPropagation flag set.
Merge-request: 1085
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
|
| | | |\ \ \ \ \
| | | | |_|/ /
| | | |/| | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
4.7.2 changes
Change paging attributes for Symbian binaries
Fix build failure
Fix regression in creating mkspecs/default
Changes for 4.7.2
Recreate Symbian raster backing store when WA_TranslucentBackground set
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Reviewed-by: TrustMe
|
| | | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | |
| | | | | | | |
Removed UNPAGED workaround from QtCore and QtSql on OS releases where
data paging is supported. Depends on new macro being defined in the OS
builds (SYMBIAN_DLL_DATA_EXPORTS_SUPPORTED) to allow us to detect this.
Data exports are supported in all S^3 builds after early 2009, however,
this macro is only added recently (and thus isn't defined in, eg.
Symbian Foundation PDKs (v3.0.4), or current releases (v0.9) of the S^3
SDK from Nokia). Thus building Qt against these older S^3 builds will
still result in QtCore and QtSql being unpaged.
Also, remove PAGED keyword from all Qt-based software. This changes the
code paging field in the Symbian (E32Image) header from "paged" to
"default". Thus it is left to the configuration of the particular
device whether paging is used for the binary or not. All devices that
support code paging should have it turned on (the value is stored in
the HAL, so can be checked using eg. fshell); data paging may or may
not be turned on depending on the device characteristics. Leaving both
code and data paging as "default" means that any limitations in the
device (eg. around flash wear) can be controlled by that device by
disabling the appropriate types of paging.
This change also leaves the way open to deprecated PAGED as a keyword
in the Symbian build systems, so you can only opt out of paging. This
makes more sense, as the default for code paging will be on, the
default for data paging will be on if the device can handle it, and
binaries should only be opting out of paging if they have some specific
real-time requirements that paging inhibits.
Task-number: QT-3503
Task-number: QTBUG-13931
Reviewed-by: Shane Kearns
|
