| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
|
|
| |
Always clear the XSizeHints before retrieving with XGetWMNormalHints
because if the window doesn't have size hints set the structure will
remain uninitalized. Clear XSizeHints in other locations as well just
to be safe.
Task-number: QTBUG-15418
Change-Id: Ia9a0c485389bf27016ee7f206a3a916d0bbcbcfa
Signed-off-by: David Fries <David@Fries.net>
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The Qt 5 fix (aec5b76) doesn't apply here, because it introduces
a new symbol that might break forward compatibility if code
compiled against a newer Qt 4.8 is run against an older Qt 4.8,
and QScrollBar::wheelEvent() ends up being devirtualised.
So copy the guard clause from QWidget::event() here.
Task-number: QTBUG-27308
Reported-by: chenjiexin
Task-number: QTBUG-21534
Reported-by: Martin Koller
Change-Id: I5d2f823c65bae8cff33bac320c37e6496b14646c
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
We did coordinate rounding of the fill in the raster paint engine to
match how drawLine_midpoint_i rendered lines. With the new cosmetic
stroker in 4.8 this rounding is not needed anymore.
Task-number: QTBUG-26013
(cherry picked from commit b6acec1e5d55d03ad3a0a70d2cf371d3f8fde629)
Change-Id: I0324e3a45c525890fb58817a180c6aa712716780
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
When Qt was built statically then the Mac specific resources were not
being loaded which meant some style specific images were not used.
Task-number: QTBUG-25391
Change-Id: Iad538b5f1935ed1744617d6e47ae3e68aa36afac
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-27263
QWExtra object pointer is not guaranteed to be valid in
QWidget::unregisterOldDnd() since commit
f6bf4b2baa91e55f40596bf3f2823b119fdfa5e0. To avoid crash we have to check
QWExtra object pointer of the native parent widget before access it, and
if the pointer is not valid we should check its native parent widget
recursively.
Change-Id: I764fea4a0826cff751dd74a0fb67e0d2971c1d49
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Set fd in openPrintDevice() so that it gets cleaned up properly
in closePrintDevice().
Backported from the Qt5 commit:
99bab571b4cb41362e891f1bb1e812119701c932
Task-number: QTBUG-14724
Change-Id: I02968d597822b636078ae89566dd8ed8a948019b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
As it turns out, the convention of (dis)connectNotify() is to include
the signal prefix, i.e. '2'.
Therefore add this prefix also when calling these functions from QML.
Also add a unit test confirming that the C++ and QML cases are now
handled the same way.
This patch is not needed in Qt5, as connectNotify() and
disconnectNotify() take a QMetaMethod as a parameter, not a
const char*.
Change-Id: I3add0fc13c60a479949cf3d31218af5fd3f546a2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
| |
Change-Id: Iac5df9edbe16ec841f783bc5266091a6e34e9cab
(cherry picked from commit 4efd73bc3ac318ec40adea2f21b3c9359ea1795a)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This reverts commit ecc432a5b7ae269220f86c6f0b3dd364f8643191
to fix a crash on exit.
Task-number: QTBUG-20377
Change-Id: I6606ff194f2c16e06bdbbfca94e55821cf055f75
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
"HTTP/1.1 100 CONTINUE\r\n"
If the header from a server is splitted between two packets
the first packet contains "HTTP/1.1 100" and the second one
contains " CONTINUE\r\n", one space (0x20) is skipped. After
processing the line looks in this way "HTTP/1.1 100CONTINUE".
QHttpNetworkReplyPrivate::readStatus(QAbstractSocket *socket)
is called twice, if a http header is splitted as above.
The function always removes whitespace from the beginning of a packet,
even if it is the second part of a http header
QHttpNetworkReply returns QNetworkReply::RemoteHostClosedError
due to damaged http header during processing.
Task-number: QTBUG-27161
Backported qtbase/60f4fc8b706db9cbeacd5dc4886a7aa347daafc0
Change-Id: I07ec43641bbb9966285a8a1f57a51fb27d2643d4
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
A horizontal line should round up at the same time as a vertical line
with square cap, when rendering at subpixel coordinates. Thus, the
special casing in the cosmetic stroker of offsetting by half a pixel
should be for flat caps instead of for square caps.
Task-number: QTBUG-26013
(cherry picked from commit 72aaba336c7afe6d79d59995bfb31a8effca4e9e)
Change-Id: If7e7c6b6e37c5b1ce4685012a11fd29ff0b1df5a
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
| |
This patch is not needed in Qt5, as it works as expected.
Change-Id: I3d165c3f5b8562207af20a0564c3884270d17b44
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The test has one unstable failure on Windows, so mark this with QEXPECT_FAIL
Task-number: QTBUG-26906
Change-Id: I2f6c63ddefecacd224d93f83e6951e961a02a051
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
(cherry picked from qtbase/531b96f42ef225f6f680f6049ab718b0f6729a3d)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
| |
NSEvent for mouse events contain the mouse position in floating
point numbers. This value is truncated/floored for mouse clicks.
Qt instead rounds that value, so mouse move events can get positions
that are slightly off sometimes. This solves #QTBUG-27273.
Change-Id: I2d3f59a09f50cb83dc1ccf6de940b7d99087c9ee
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
CFG_MAC_DWARF2 and CFG_MAC_XARCH options are for targetting macs, not
bulding on them.
qt5/qtbase commit 7a67c822e3e552d0d881f0409a5316de07dbb8c7
removed CFG_MAC_DWARF2.
qt5/qtbase commit 59d5c26075724a581ed276d62d884b44d2ca4489
removed CFG_MAC_XARCH.
Change-Id: Idb789ed9a8aa9b824a4c2191a9c39e741ca49574
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
There are two types of rotation to be considered:
1. Rotation of native widgets
The corresponding window should be rotated and resized proportionally to the
new screen geometry.
2. Rotation of toplevel windows.
The window will be only rotated. It will be only moved or resized if it
becomes clipped, in order to be fitted on the screen properly.
cherry-picked from qt5 89d9f8fe949e65e7455fabe288ea284aa6de06b1
Change-Id: I837da53f1a12a7b8aff1e0e9d6f4579e3aefaf2a
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
If glGetBooleanv fails this variable is left uninitialized.
Task-number: QTBUG-26952
Change-Id: Idb42833f2907bb66fd87c5cdb39753fca04e7438
(cherry picked from commit 0d55b4596f490f8f64eb3134e77e59df7d1c16f9)
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
For instance on Blackberry this would try to include Mac libraries as
well.
In Qt 5 this is still working.
Change-Id: Iae9d3b7e1b988ac8932c58deabfeb249cd2cfc2e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Disable SSL compression by default since this appears to be the a likely
cause of the currently hyped CRIME attack.
This is a backport of 5ea896fbc63593f424a7dfbb11387599c0025c74
Change-Id: I6eeefb23c6b140a9633b28ed85879459c474348a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Peter Hartmann <phartmann@rim.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The value of PKG_CONFIG might depend on device options.
For example, "-device-option PKG_CONFIG" might be used with configure
or a mkspec might prefix PKG_CONFIG with CROSS_COMPILE which is
specified as a device option.
The shell functions of configure for parsing mkspecs do not take
device options into account, but qmake is pretty good at it now.
backport of qt5/qtbase 01864d4854557d2cf8b067e229d77cd7c9c553ee
Change-Id: I1c9558e550c48e8441ebdac34b82066473c2ce3a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
pkg-config isn't used before qmake is built, so these tests can take
place afterward.
This is preparation for using qmake to resolve PKG_CONFIG in mkspecs.
Change-Id: Icedf9ebd80bbac3fe1e5d7eeca358cb0fc9de072
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Similar work was done in Qt5 in Change Id3b02316
Change-Id: I392d2a5bfffb9a335f28d5dbc5ea27b800fc4487
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
|
|
|
|
|
|
|
|
| |
backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was
incomplete and broke building of configure.exe
Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Backport of 3f407cddf8b1d5fc09b414dbecd9a47d30e3abe7
Change-Id: Id7fd3ca76793d8d3e3698dd402fe31e04567e938
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
| |
This change is not necessary on Qt5.
Change-Id: Ie35db0d31dccd2771ba80030ee9104880f50e6b0
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
This makes this test in line with other tests that define SRCDIR on the pro
file instead.
This change is not necessary in qt5
Change-Id: I789288c42a5c48bb62919fb361d2a357a8dd9832
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
|
|
|
|
|
|
|
|
|
|
| |
The Blackberry OS uses a filesystem with the noatime option,
which returns a "wrong" access time.
cherry-picked from qt5 31f94e028527ffa02b954a3a91eabe80e2926838
Change-Id: Ic37d19b62ffbed6f67dbbbdf76bb4202bb0472e5
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
| |
Backport of 6998c4b2ad5fdf5f525bd77ec0fd3c6667b102b7
Change-Id: I32ceb7cc8e000c8fd00bf9e5ed6d6f8b796c73ad
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS.
It is a documented breaking change:
http://msdn.microsoft.com/en-us/library/bb531344.aspx
Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f
Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
The example needs no_batch in CONFIG because examples/script/customclass
and examples/script/qscript contain a main.cpp and nmake's inference
rules get confused which one to choose.
See QTBUG-13496 for details.
Change-Id: Ia5b06d985504ff4e72ea5e492a623edce252f57a
(cherry picked from commit qtscript/6bc42fb243edf5870c82cca6c53824a588007faf)
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
|
|
|
|
|
|
|
|
| |
Backport of d7a15fbfd93fb566c7793596ea50d8786b9eb654 from qtbase.
Task-number: QTBUG-27122
Change-Id: I0b1eda292fd9648e6f08629f7a069b66bb8b59e8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This prevents memory leaks when the engine is destroyed after exec()
has already finished. In most cases this happens during application
shutdown, at which point the event loop is never entered again.
Task-number: QTBUG-20377
Change-Id: I65564ed3e56314d656d92fd66f11ae67d4eb932b
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This test checks the access permissions for '/etc/passwd', however the
filesystem on Blackberry is always read-only.
cherry-picked from qt5 4a588c27e8073076cca19a8cc6eed5f1ce1d07e2
Change-Id: I6d14785dd94205761e3a73fc7aa420b805cd13a6
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
|
|
| |
ENABLE_EXECUTABLE_ALLOCATOR_FIXED requires sys/mman.h which is not
available with MinGW-w64.
Change-Id: I6e76ce0c570e5819657debf813f0e80cef907dd4
(cherry picked from commit 02c37f59839b7bb36b231560893fa3bccbecc065)
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
| |
cherry-picked from qt5/qtbase commit 5c412fd74c9164f1e73a7287ca603295ce73bcf5
Change-Id: Ib55b63d82823a348857b0f76e99b184eb475ef44
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
| |
Change-Id: I5c2df20442cdced085061622674fb7ba126028a8
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Otherwise CROSS_COMPILE is not available for config.tests
because qdevice.pri is not found in such configurations as:
./configure -xplatform win32-g++-4.6 \
-device-option CROSS_COMPILE=$TARGET \
-prefix=$PREFIX/$TARGET \
-prefix-install
Normally, we don't want to use .qmake.cache during tests,
but we need that mechanism here.
Change-Id: If255f9657fa4206c4875a730f467d58b8a1c6ac1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Introduced by 2e0003eda4783f69a40fb4b31e7084c761d9640d. We were
missing a attributesEmitted=true which caused the output from
toHtml() to sometimes be invalid when using pixel sizes to
specify the font size.
This is a back-port of e640ebacb97f6eea9614925b1da3b97a0ff51409
from Qt 5.
Task-number: QTBUG-25778
Change-Id: Ied61fcaef425a590d71c0b52292ac676cb88ba52
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
|
|
|
|
|
|
| |
Change-Id: I4e958c1a0053a0c582a10a36dc0f4841ad39f715
Reviewed-by: Leonard Lee <leonard.lee@nokia.com>
Reviewed-by: Jing Bai <jing.t.bai@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
QDirectFbWindowSurface::resize() must call parent
QWindowSurface::resize() method in order to update QWindowSurfacePrivate
size.
Change-Id: Icd605dc1923f2560579ccb2e4f800c80ff7e92fd
Reviewed-by: Holger Freyther <holger+qt@freyther.de>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This reduces memory consumption of an application quite a bit.
This is a backport of 3958828af8ee5cc046c664d8d8e483314eac06cb from
qtjsbackend.
At the same time, it is a backport of upstream commit
http://trac.webkit.org/changeset/111234, although the patch is quite
different as upstream and Qt's JSC have diverged a lot.
Change-Id: Ia76359ae614ddd4aeda9c7c7b012e5809b50074d
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Some POSIX platforms do not support realpath(X, 0).
This commit is akin to the following qt5 commits:
4a4e9e4a9c56f9b27f2fb76fae6ff06b9f470895
ad5d64226abd50a43856ab560583f37b49ff04c9
6e8e1da0a8267d2f8f568403e6ab9fe53b01cd29
f3707a5a0c4483b15e7bb2ba9f0e7d1913a713ee
Change-Id: I05dc12cedefcaaa11eec2bcc71df023fdb51ac00
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
| |
Change-Id: I6f83b1223b7bd57b5dfc46fe5bed276269b1a676
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
|
|
|
|
|
|
|
| |
patch not needed for Qt5
Change-Id: I26a6cd8de91dc6df7d31a9f38187f7b1e8209cc1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This partially reverts commit c7d5071afc6c76925c90ff35041dc4eb86511271.
Despite what the commit message said, pkg-config previously worked
and was useful, particularly for static Qt. Qt itself even installs
its own .pc files.
Note: The mkspec win32-g++-cross had a PKG_CONFIG definition to avoid
using the pkg-config installation on the build machine.
cherry-picked from qt5/qtbase commit 7d9b5e8e7d2094dedbe7e3e2f961544f233ce57e
Change-Id: I6c6ed81b2ab42c9cf7f7e250feeeb9c34c8877e7
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
|
|
|
|
|
|
|
|
|
|
| |
Extend drawPixmap capabilities for qpa through new OpacityPixmapCapability
QBlittable flag and add related implementation in DirectFB platform.
cherry-picked from qt5/qtbase 4ae829c1dbd0e8a72b82ab4c6cddb0a4ffe009f6
Change-Id: I8abdb0fa72bc030d769190d7cba40561007e7b46
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
|
|
|
|
|
|
|
|
|
|
| |
If the sendEvent function is replaced on the NSApplication, then
QApplication should ensure that it undoes that if it is destroyed while
the NSApplication is still running.
Task-number: QTBUG-24248
Change-Id: I087ae575b7d670fa8dacfb80636d813c7bceb41d
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
When a parent item had its visiblity toggled, then the child item would
not update if the parent item had ItemHasNoContents and
ItemClipsChildrenToShape set. This is a common use case in declarative as
the root item has ItemHasNoContents set.
Task-number: QTBUG-26846
Change-Id: Id6592ebc4ba2caa4331a4a71f7247e40993131b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 49c251e0543ea80e69d1725bb08bb4dfe3f225ab)
|
|
|
|
|
|
|
|
|
|
|
| |
Add non-opaque fill support for qpa through new QBlittable flag
"AlphaFillRectCapability" and add related implementation in DirectFB
qpa platform.
cherry-picked from qt5/qtbase aab15782e21bf0aaea7f2211278e9aa9fc78c6d7
Change-Id: Ia1c74c2926d2e244290dcb62cbd3b6848ba95707
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
|
|
|
|
|
|
|
|
|
| |
If a merged action is removed then a crash can occur if it is readded
later.
Task-number: QTBUG-24917
Change-Id: I43dcde3f40950fafc33d976e861a90fe1c38d061
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
|