| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
| |
Task-number: QTBUG-14137
Reviewed-by: Aaron Kennedy
(cherry picked from commit f9a8c4ec598a0070b9d2d861efe5ee69d5045a1f)
|
|
|
|
| |
(cherry picked from commit 72fd8399aa36395e41f497fff79842496d6f9b03)
|
|
|
|
| |
(cherry picked from commit 7d5afd371d634e35192ab27f65c6dc895f7bbb5c)
|
|
|
|
|
|
| |
Task-number:
Reviewed-by: Yann Bodson
(cherry picked from commit 753d366ced1a62a97d5207eb2708817efc35bc4d)
|
|
|
|
| |
(cherry picked from commit ba698e20b32defcb0840293fc4ac5948f7c190c9)
|
|
|
|
| |
(cherry picked from commit 646c37a670b101487a76b1e787fd298187b49430)
|
|
|
|
| |
(cherry picked from commit 0ce33ebfa8b99c2988b56d0157ddc039a9ab06ae)
|
|
|
|
| |
(cherry picked from commit 8050dc45c8c9a134875196dcddf010d4194fd974)
|
|
|
|
| |
(cherry picked from commit 3519840ef2c5cb7cbc5b32ffc9976a8638187d64)
|
|
|
|
| |
(cherry picked from commit 99340cf858731f531af29be1e1368e4991e8564e)
|
|
|
|
| |
(cherry picked from commit c1a9c50d53ae41b19bdcd7930eec0805498e01c6)
|
|
|
|
| |
(cherry picked from commit 583ca462caf656af17bea1c3f05d88ae7785ae91)
|
|
|
|
| |
(cherry picked from commit 2d1e3b9778328046d3ba94dd51c37c507e618721)
|
|
|
|
| |
(cherry picked from commit 2b70a3a6d5ebef36e90f52076c5d942d8cc171d7)
|
|
|
|
|
| |
Reviewed-by: Frederik Gladhorn
(cherry picked from commit 02de74f0b2d443e410154e96321357cfe2ef9aad)
|
|
|
|
| |
(cherry picked from commit fbf91dc787c15f561686cd708735ff8f45984aba)
|
|
|
|
| |
(cherry picked from commit baa2d6bee64e458f547b290d7cd1acdfc6292e05)
|
|
|
|
| |
(cherry picked from commit bed3d1eca213f24dae13cbd4cda4df94d9f0738b)
|
|
|
|
| |
(cherry picked from commit f160e04ebe2926d09c20ef3960def1388a566db7)
|
|
|
|
| |
(cherry picked from commit 9c97aa4946a1d6b22bdcd8475f32b5ead7051976)
|
|
|
|
| |
(cherry picked from commit f2be9f394972edffa0eebc9c30fe00a4fce81abc)
|
|
|
|
| |
(cherry picked from commit 77b9b5dc93662d505b2c69211d001e5672d8a2cb)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
pixel."
This reverts commit 2acdc634ee895af4a9738c0f6c2496e388afba38.
Originally this fixed QT-3791 but it caused lots of problems in
other sites. So reverting this will fix QT-4001 but reopens
QT-3791. QT-4001 blocks Qt 4.7.1 but QT-3791 doesn't.
Task-number: QT-4001
Reviewed-by: Jason Barron
(cherry picked from commit 25ddfb434f13aa3bbc6ac303aa17dbe9582bf3f0)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In portrait orientation, QDateEdit's calendar popup (QCalendarWidget)
does not fit into screen.
As a fix, the pixel metric PM_FocusFrameHMargin, is reduced from
13 to 3 in qHD screens (640*360). Also, the explicit halving of
the pixel metric for QTableViews is removed.
The pixel metric resulted in 27 pixel text margins (2 * pm + 1)for
calendar widgets, which is clearly a bit too much.
Task-number: QTBUG-14126
Reviewed-by: Miikka Heikkinen
(cherry picked from commit b3f895fd97deda0c7c5bfd704c04450e7afee748)
|
| |
|
|
|
|
|
|
|
|
|
| |
The problem is that with empty layouts we could sometimes divide by 0.
Note: This doesn't fix the whole task...
Task-number: QTBUG-13547
Reviewed-by: ogoffart
(cherry picked from commit c1f9978c9d61bcbdb2f280185a3abdea13d7f532)
|
|
|
|
|
| |
Reviewed-by: Thiago Macieira
(cherry picked from commit b8089f0b7a0fef9318070aea9c8344bfe987bac9)
|
|
|
|
|
|
|
|
|
| |
MS has released a hotfix for the support of MSVC 2010 64-bit.
It fixes the optimizer that could generate code that crashes.
Reviewed-by: Trust-Me
Task-number: QTBUG-11445
(cherry picked from commit ce2a273bab9b9094a1f0f3f60309797e11e59404)
|
|
|
|
|
|
|
|
|
|
|
| |
the problem was that the item is first painted at its default position,
then moved by the layout and finally repainted.
We now made sure the item is laid out before the first paint event
occurs.
Task-number: QTBUG-13865
Reviewed-by: bnilsen
(cherry picked from commit 33f525e636ef8fa64a15d3e66c56adaea0075bda)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Change c46688b8a88da made us use m_curve_threshold for both
QBezier::shifted and QBezier::toPolygon, and adjusted the threshold
dynamically based on the painter scale. Since the threshold in shifted
was already relative to the pen width, it is independent from the
painter scale. Instead, we need to set a separate threshold for dashing.
Also, in several places we were calling setCurveThresholdForTransform
with the painter matrix even though we were transforming the points into
device coordinate space before stroking.
Task-number: QTBUG-13894
Reviewed-by: Gunnar Sletta
(cherry picked from commit d60dc7cba21794866c9382f83080fab1a129eb08)
|
|
|
|
|
|
| |
Task-number: QTBUG-14070
Reviewed-by: Gunnar
(cherry picked from commit 4cd4160d85dc1e158a545422cac895792b14eda6)
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit 62b5ef3cc1306e46a4042b14867f2f92d9a110f3.
The implementation of hfw from this patch is unfortunately not robust enough.
It doesn't manage correctly the constraints on the layouts and the cell spans.
It caused bad behaviour or regressions seen in tasks:
QTBUG-13547, QTBUG-13067, QTBUG-13549, and more
Reviewed-By: ogoffart
(cherry picked from commit 5bd6f7eb5c7d87c08539b6c2df416990cc417ec7)
|
|
|
|
|
|
|
|
| |
Always flush sockets after sending data, and make autotests more robust
by using busy wait.
Reviewed-by: Christiaan Janssen
(cherry picked from commit cfe198948f1e4867918176df38b3e0b49757a4b8)
|
|
|
|
|
|
|
|
|
|
| |
When statusChanged() is called during handsake state() was not the same
as the argument passed. Fix this by setting gotHello = true _before_
notifying the clients.
Reviewed-by: Christiaan Janssen
Task-number: QTBUG-14087
(cherry picked from commit a1f050fe4217d3a642ab7f4df8e50c21aa51689c)
|
|
|
|
| |
(cherry picked from commit 9caae83e1f2b9c56ee86b8523391e6a83ea724c5)
|
|
|
|
|
| |
Reviewed-by: Christiaan Janssen
(cherry picked from commit 30959e88498b2c8591145e30c8b497a76c12d8f6)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The protocol so far was client->server only. That is, there was no
sane way for a client to check whether a plugin on the server (service)
was available or not. E.g. calling Client::setEnabled(true) 'succeeded',
without a check whether there is actually a service to talk to.
The new protocol replaces this shortcoming by a service discovery
mechanism: Both client & service announce their available plugins at
handshake time, and later on if there are changes. The status is
reflected in Client::status() and Service::Status() , which are either
NotConnected - no network connection, or not registered properly
Unavailable - TCP/IP connection works, but no plugin with the same
name on the other side
Enabled - You can connect to plugin on other side
The status changes happen automatically (no setEnabled() anymore).
Furthermore a version ID was added to the handshake, so that we can
extend the protocol further in the future :)
(cherry picked from commit fd9771c29d401d88779ab7c5d7715c9ca41dd723)
|
|
|
|
|
|
|
| |
The QmlDesigner(Bauhaus) should not rely on -nokia-developer
Reviewed-by: Marco Bubke
(cherry picked from commit 8ad396891f2a4966ad3cf943f99e208211e956bb)
|
|
|
|
|
| |
Reviewed-By: Oswald Buddenhagen
(cherry picked from commit 7412ac5b38d83b627a372a525f271c225f9c1f70)
|
|
|
|
|
|
|
|
|
|
|
| |
Breakpad is a portable crash handler. It sends the raw crash
information to a server for analysis. This analysis needs debug
information. Consequently, we compile with debug info even in release
mode if qt-breakpad integration is requested (via an environment
variable).
Reviewed-by: ossi
(cherry picked from commit 1a99cdbb36334e17c34b38dd5df1bdd70167b42a)
|
|
|
|
|
|
|
|
| |
Fixes crash in creator. If flag is true notifications are sent. It is important
that positioners work correctly and don't leak.
Reviewed-By: Alexis Menard
(cherry picked from commit 3b43389b78925ce87d660c343c925fa280b91e11)
|
|
|
|
|
|
|
|
|
|
|
| |
This ensures that if the component has already been completed, itemChange()
is called. This is required to modify QDeclarativePositions in the visual
editor, while keeping a legal state. Without this patch notifications are
missing and the Positioner keeps track of already deleted children.
This resulted in a crash.
Reviewed-by: Thomas Hartmann
(cherry picked from commit 1f8bb573f06234a3d13fb57de5eb644824d5024f)
|
|
|
|
|
| |
Bauhaus needs this export to manage layouts.
(cherry picked from commit 858469445ceb745c70dad9cd4f913acc34683e15)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit f7a439a0a00b0bdd6ebeff8bfd5ee2285eab1398)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 1ab457d5db184c53d9857a7b425051e5aa5ff2e0)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 1f43e68c4ca5b28444b046deff1658b1b4b1923d)
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 6f35701275ab0cd80daec45b3407725b10571693)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-13799
Reviewed-by: Martin Jones
(cherry picked from commit 49452ad6b22e080b1dfdfde38c21c48bb910a1ae)
Conflicts:
tests/auto/declarative/qdeclarativeconnection/data/error-object.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property.qml
tests/auto/declarative/qdeclarativeconnection/data/error-property2.qml
tests/auto/declarative/qdeclarativeconnection/data/error-syntax.qml
tests/auto/declarative/qdeclarativelistmodel/tst_qdeclarativelistmodel.cpp
tests/auto/declarative/qdeclarativeqt/data/quit.qml
tests/auto/declarative/qdeclarativeview/data/error1.qml
|
|
|
|
|
|
|
|
| |
Qt 4.7 is still supported, but deprecated.
Reviewed-by: Martin Jones
Task-number: QTBUG-13799
(cherry picked from commit 4fcf055f66cc23c9e60a7add489e394420e71914)
|
|
|
|
|
| |
Task-number: QTBUG-13799
(cherry picked from commit 746954581f06e0bca98f25eb95dca09c663d47bf)
|