| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Fixed bug in meego graphics system runtime switching.
|
| |
| |
| |
| |
| |
| |
| | |
Switch when the last _visible_ widget is destroyed (and also switch back
when a widget is mapped and there are no other visible widgets).
Reviewed-by: Armin Berres
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-staging:
Fix memory leak in QXmlQuery::setQuery.
doc: Fixed QTBUG-19226
doc: Fixed QTBUG-19223
doc: Remved debug code for QTBUG-18791
doc: Fixed QTBUG-18791
doc: Fixed a QML snippet reference
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
There is a circular reference dependency between VariableDeclaration
and the classes EvaluationCache, ExpressionVariableReference and
TemplateParameterReference. By removing the explicitly shared pointer
of VariableDeclaration in these classes the circle is broken and memory
is freed correctly.
Task-number: QT-4106
Integrated-by: David Boddie
|
|\ \ \
| |/ /
|/| |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix instability in QNetworkConfigurationManager autotest
Support word selection list with predictive text from splitview
Fix softkey icon positioning in S60 5.3
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
In S60 5.3, Avkon apparently expects softkey icons to be 32x32 and
positions them accordingly into the softkey, instead of needing the
application to supply the whole softkey image.
Fixed by skipping the softkey image centering when S60 version is 5.3
or larger.
Task-number: QTBUG-19104
Reviewed-by: Sami Merila
|
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When splitview is active and user taps a predicted word, mouse button
should be forwarded to m_pointerHandler, which opens a suggested word
list. When splitview is not active, but there are HW QWERTY keys in the
device, tapping a word, should only move the cursor. Without HW QWERTY
and no splitview, native editing state handles the functionality.
Task-number: QTBUG-19062
Reviewed-by: Miikka Heikkinen
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
QDeclarativeMouseArea: block context menu events
ListViews loses items if all visible items are removed.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
If the MouseArea accepts the same button used to trigger a context
menu event, it should not let the event to be delivered to item
behind.
This is important for items that do implement contextMenuEvent(), like
QDeclarativeWebView. When there's a mouse area on top of this item and
that accepts the right click (in Linux), the event was still being
delivered and the WebView menu was incorrectly appearing.
QtWebKit bug https://bugs.webkit.org/show_bug.cgi?id=56526 documents this
problem.
Change-Id: I386fac6c96f47b8616e2eeb7e5f97043ba418980
Merge-request: 1185
Reviewed-by: Martin Jones <martin.jones@nokia.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Occurs when at end of list and all visible items are removed in
multiple steps, without entering the event loop.
We were not updating visibleIndex if there were no visible items
when handling itemsRemoved().
Also avoid skipping items in refill if there are no valid visible
items for reference.
Change-Id: I2ff58fb191f6b053f33d5446220d597eb15b66d4
Task-number: QTBUG-19198
Reviewed-by: Bea Lam
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Make TextEdit word selection more natural.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QTextControl will only extend the selection to a word if the cursor is
directly over it which prevents the selection being extended if the
mouse is dragged up or down a to a shorter line of text making it
difficult to select multiple lines of text. Just disable that
limitation when the TextEdit word selection is enabled.
Change-Id: I3b9d1575c0141db8441197d740de94a90eacc077
Task-number: QTBUG-19230
Reviewed-by: Martin Jones
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Clear confusion between QMainWindow and QMainWindowLayout.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The variables activateUnifiedToolbarAfterFullScreen
and useHIToolBar were implemented in both classes.
This was an obvious bug, where variable would be
initialized in one class and use in the other one.
Task-number: QTBUG-18874
Reviewed-by: Yoann Lopes
(cherry picked from commit 15a5eaf0eeb44833a052b6201171fca4b9e8f74e)
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix for rounded corners bug in QMenu
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Currently QMenus have opaque black corners in cases
where theme supports rounded corners. This patch fixes
it by setting WA_TranslucentBackground flag to QMenu
widget.
Task-number: QTBUG-16857
Reviewed-by: Sami Merila
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
QWidgetPrivate::setParent_sys might be using null pointer
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Fix possible null pointer usage.
Issue found by Coverity tool.
Reviewed-by: Miikka Heikkinen
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Ensure the TextEdit cursor delegate is repositioned on mouse events.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Update the micro focus when a mouse press changes the cursor position
of a read only TextEdit.
Change-Id: I11855037f7938b2cd23ac6ad165722b5289b4f46
Task-number: QTBUG-19109
Reviewed-by: Martin Jones
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Don't crash on an invalid replacementStart from an input method.
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Ensure the cursor position does not exceed the bounds of the
current text.
Change-Id: If38f7729372562324d11eadd1a976c0c6da91863
Task-number: QTBUG-19054
Reviewed-by: Martin Jones
|
|\ \ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Fix incorrect hardware address on systems without getifaddrs()
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
On unix systems for which QT_NO_GETIFADDRS is defined, the way that the
hardware address field is extracted from the result of a call to
qt_safe_ioctl() is incorrect. The address of the ifreq.ifr_addr struct
is taken rather than the appropriate member within that struct, sa_data,
resulting in a memory offset and subsequently the hardware address has
garbage in the first two of six fields. This commit modifies the code
to pass the sa_data member instead of the address of the struct as a
whole.
Task-number: QTBUG-19165
Merge-request: 2614
Reviewed-by: Martin Petersson
|
|\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Enable multisampling on Symbian if hw supports it
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
BCM2727 don't have hw support for multisampling
but on other chips it should be enabled on Symbian.
Task-number: QTBUG-19183
Reviewed-by: Samuel Rødal
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix QtCoreu.def file error
Introduce platform extension to QGraphicsSystem
Update changes for 4.7.3
Show softkeys when opening a dialog that has a fullscreen parent.
QSslCertificate: report fraudulent certificates as invalid
QSslCertificate: fix test for blacklisted certs on Windows
QSslSocket internals: abort on encountering blacklisted certificates
QSslSocket: add test for blacklisted certificates
Changes for 4.7.3
Fix for wrong dpi metrics for raster pixmaps on Symbian.
Fix qgraphicstransform autotest for Symbian, where qreal is float.
QS60Style: QTreeView::indexRowSizeHint returns incorrect value
QDeclarativeDebug: Export needed symbols on Symbian
Bump Qt version to 4.7.3
Fix QTBUG-17627: build break in mobility bearer applications
Fix for major regression in OpenVG clipping
Unsuccessful unlocking of QNetworkConfigurationPrivate mutex
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Hybrid heap exports should not be listed in QtCoreu.def
Reviewed-by: TRUSTME
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Qt on Symbian needs some special capabilities to be able
to work on 32MB GPU. This patch introduces some Symbian
specific functions to QGraphicsSystem
Task-number: QTBUG-17882
Reviewed-by: Laszlo Agocs
|
|\ \ \ \ \
| |/ / / /
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix Symbian/WinsCW build break
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
A new exported method qt_draw_decoration_for_glyphs was recently added
to the QtGui, but DEF file was only adjusted for ARM.
Reviewed-by: Tomi Vihria
|
|\ \ \ \ \
| | |_|_|/
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Prevent crash in OpenGL engine when scaling images / pixmaps.
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Make sure the resulting image / pixmap is valid if the source was valid.
Task-number: QTBUG-19157
Reviewed-by: Kim
Reviewed-by: Benjamin Poulain
|
|\ \ \ \ \
| | |_|/ /
| |/| | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Fix -no-gui
Don't run XLib check if -no-gui is used
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
If we can not get online when the request is made then we are in the
WaitingForSession state. This will happen for example if the device
is in flight mode. This fix follows the same logic as in
_q_networkSessionFailed, but we should look into why we have the
WaitingForSession check in finished().
Task-number: QT-4747
Reviewed-by: Markus Goetz
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
-no-gui still tried to build the graphicssystem and inputmethod
plugins, both of which require QtGui
Merge-request: 1215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|\ \ \ \ \
| |/ / / /
| | | / /
| |_|/ /
|/| | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
fix random miscompilation with msvc
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: joerg
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
as a side effect, don't use QDir for path resolution - it doesn't buy us
anything.
Task-number: QTBUG-1371
Reviewed-by: joerg
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Task-number: QTBUG-11602
Reviewed-by: joerg
|
|\ \ \ \
| |/ / /
| | / /
| |/ /
|/| |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QNAM: Re-order checks in migrateBackend()
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Do the easy checks first, will avoid a crash in the HTTP code
if request is serviced from the cache.
Task-number: QTBUG-18770
Reviewed-by: Peter Hartmann
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Skip test on MacOS due to problems with corewlan plugin
Send User-Agent from the network request in http proxy CONNECT command
Fix initial main window dimensions for "fullscreen with softkeys" case
Fix compile errors in bearer tests
Fix QNetworkConfigurationManager usage outside main thread first
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Some proxies can discriminate based on the User-Agent when sent a
CONNECT command for establishing a HTTPS connection.
With this change, if the User-Agent header is set in the QNetworkRequest
then it will be passed to the http socket engine for use in the connect
command sent to the proxy.
As before, "Mozilla/5.0" will be used by default when no user agent
has been set.
Task-number: QTBUG-17223
Reviewed-by: Markus Goetz
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The application main window defaults to fullscreen size when initially
constructed, even if softkeys are specified for it, as the screen
furniture is constructed later in show_sys. This resulted in the main
window being partially under softkeys.
Fixed by invoking handleClientAreaChange() explicitly in show_sys in
fullscreen with softkeys case.
Task-number: QTBUG-19043
Reviewed-by: Sami Merila
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
QNetworkConfigurationManager creates the engines loaded from plugins
as objects in the main thread.
If a QNetworkConfigurationManager instance is created in a worker thread
without any instance previously existing in the main thread, then it
is uninitialised until the main thread has run.
This causes allConfigurations() to return an empty list if called
immediately after instantiation, for example.
This fix initialises the plugins using blocking queued connections,
which causes the worker thread to block until the initialisation function
has been called in the context of the main thread.
Deadlock is possible if the main thread is for some reason waiting on the
worker thread, but it will not deadlock on QNetworkConfigurationManager's
mutex.
If this is a problem for an application, it should use
QNetworkConfigurationManager from the main thread first to preload the
plugins.
Task-number: QTBUG-18795
Task-number: QTBUG-18799
Reviewed-by: Cristiano Di Flora
|
|\ \ \ \
| | |_|/
| |/| |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Views do not notify count changes properly
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
The views don't have a valid count until both a model and a delegate
are provided. But, countChanged() is not called when a delegate is
set after the model, so bindings to count were not evaluated. Also
test that count is updated for insertion/removal
Change-Id: Ic82039a624c02f0bdb2862ac7a6e215df75bb314
Task-number: QTBUG-19037
Reviewed-by: Bea Lam
|
|\ \ \ \
| |/ / /
| | | |
| | | |
| | | | |
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
Uninitialized memory is compared.
|