| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
|
|
|
|
|
|
|
|
|
|
|
| |
It currently loads source files as latin1, which means other encodings
are not supported.
Qt 5 change: c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce
Task-number: QTBUG-27238
Change-Id: Ieb4de351d93bd5ac2939692c5c53bd681fea4386
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
| |
Change-Id: I2775c2cf4a3a2b1295d389da665e5e8aadea21e9
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
With a global shortcut set it would be possible
to let the button re-open the menu again and again,
each time spinning an event loop.
Backport of f5ea183cc6a6cd66fb3f804041fc112687e0a060 from qtbase
Task-number: QTBUG-30399
Change-Id: If7eddc115c77fef3df3e751fd72e7414cedaf272
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
QDeclarativeListView::itemsMoved wasn't checking if its list of visible
items was empty before accessing its first element.
Task-number: QTBUG-26836
Change-Id: I5ed42889a55026f19e44e44d14080a61fff63b59
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... before trying to update the configurations. Before, we would check
whether the pointer to the QNetworkConfigurationManagerPrivate instance
was 0 and in that case construct it. This would mean that this code path
was taken "at app shutdown", i.e. when the qAddPostRoutine had already
been called but the other statics were still accessed.
Note: This is not thread safe, but neither is the rest of the code;
making it thread-safe would require additional changes.
Task-number: QTBUG-30585
(backport of commit cc028650e590ac49293558099b3fb87720e9793b)
Change-Id: Ifaae4d758a10b44bc7f838cdc0d3a1129ed63228
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
| |
This decouples it from qAbs which is declared as a constexpr under
certain compilation flags and enables for qtbase to be compiled with
GCC 4.8
Change-Id: I78e02256ffc8b460ca74ae5241e77dfac4e09ba9
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry-picked from qtbase commit d9ff510f02bba63dabe7a081a68296056a89ae4c)
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The original intent was most likely to memset() the entire MD5Context to
zero at the end of MD5Final(), which we do now.
In file included from tools/qcryptographichash.cpp:49:
...qtbase/src/corelib/../../include/QtCore/../../src/corelib/tools/../../3rdparty/md5/md5.cpp:139:24:
warning:
argument to 'sizeof' in 'memset' call is the same expression as
the
destination; did you mean to dereference it? [-Wsizeof-pointer-
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
~~~ ^~~
Change-Id: I793c6f0944b89c0e4c5f9253cdb1071175c17152
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry-picked from qtbase commit 2bce4627e63947a3ed55009aeb8ff38974e444d3)
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
| |
We don't need it. Let linux-g++ be the default on all Linux builds,
period.
Task-number: QTBUG-30590
Change-Id: I26c73bf4f054684763b64ef5651b3488363ea7a1
(cherry-picked from qtbase commit 2c5188f0777f4a0723b4cb9fd36354a357145519)
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
This makes QGtkStyle working again on Debian experimental
and Ubuntu 13.04, where getThemeName() returns empty value.
Backported from QtBase b72aa1cad30a44b1.
Change-Id: If4cc822970088a5fb31aa28d9951db1efc0bb4fd
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
| |
cherry-picked from qtbase f0425e115e5fe5d29191f0752659a28e9a4b6757
Task-number: QTBUG-29201
Change-Id: Iec31057749d98d66d43f13635da20d097756c8ea
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
|
|
|
|
|
|
|
|
|
| |
qtconcurrentfilter.h:108:47: warning: typedef 'Iterator' locally defined but not used [-Wunused-local-typedefs]
Qt5 commit: d4c241a98059edaa7a4b15beb1cfd16ed041284e (qtbase)
Task-number: QTBUG-30594
Change-Id: Icc69e41c2d4e11962f0c8434236d4847b46e7d9d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
| |
Change-Id: Ife495cb67b9b378cbf2668157752219a98c6b435
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
target.
Cherry-picked from qt5 commit 90361fd36c803c4c5c28d67f05ed66f619e0d39c.
Change-Id: If13954d40d07aebf08b9a143964038c0996c325f
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
| |
This fix isn't needed in Qt5 as the code doesn't exist there.
Change-Id: Icb8e0b45e5bc926cf0432ec3c990bc703f7b7b04
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
| |
Task-number: QTBUG-30462
Change-Id: Ie6b3ba4975542a9d92611eb9a8547215e41d3c2c
(cherry picked from qtbase/6f0dc9f4c7c1405bdbfef32395d0fb091bb0c8c8)
Reviewed-by: Ahmed Saidi <justroftest@gmail.com>
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
There is potential trouble and no point in registering a QSocketNotifier
on an invalid file descriptor. This is prevented now in addition to the
existing warning.
Backported from qt5/qtbase: d20851f8ecd044479dd1892e92937a9135aa7856
Change-Id: I86e0a2c7ebdc6fb4cffcd39958003506ff01cb46
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
text/qtextdocument_p.cpp:1070:43: error: non-constant-expression cannot
be narrowed from type 'int' to 'quint32' (aka 'unsigned int') in
initializer list [-Wc++11-narrowing]
text/qtextdocument_p.cpp:1070:43: note: override this message by
inserting an explicit cast
Cherry-picked from qtbase/6deebc817080f9eb86d5d6fbe50444678eed4dfe.
Change-Id: Id3faf59a8d30dc829b82508c4be50439db1d9722
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
| |
Backported from QtBase 7dfee3ffc5129307.
Change-Id: I5e7d0116ed95ede87c97d8ac2b9eff3b922818f7
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This was spotted while tracking down a similar bug related to spans.
This now also eliminates the Q_EXPECT_FAILs in
heightForWidthWithSpanning(), since it now finally works.
The problem was only for the maximum size, since the size of an ignored
row/column was min: 0, pref: 0, max: FLT_MAX (the default constructed
values for a QGridLayoutBox).
Change-Id: Ibb33c26ede40ed02edd26f596ba6133d59c9962f
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
(cherry picked from qtbase/9d7ae6dfbe25fb70a362a4cf955c187cd24cb007)
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch makes qt.prf not warn about libraries in QT that are separate
modules in Qt 5, but exist as part of some larger library in Qt 4.
With this change, both Qt 4.8 and Qt 5 projects can use
QT += widgets concurrent
to continue compiling unchanged under either Qt version.
Change-Id: I6f7c6a913377d7b44263c8ed152b272aa7ed9aa2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
|
|
|
|
|
|
|
|
|
|
|
| |
Call qt_safe_open in the constructor
to avoid opening the pps files several times.
backport: f1d8987b82ce6b0a852b715a8713608bfd72aabf
Change-Id: Ia6b8ca339fa2f9f85df28792e95242b6ff7b70ca
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
If a row/column is only used only because of the spanning of an item,
the cell should be treated as it didn't exist. We keep track of this
with the "ignore" bit array.
The old code would always start from the row/column at position 1.
In the attached testcase this made the effectiveRowSpan become larger
than actually needed.
Task-number: QTBUG-30255
Change-Id: Ief0e7018ee8e5ee36272ce075a43312ffeac7b91
(cherry picked from qtbase/f9e43c526a30ae3912adfe3d5cb781af5ddda4b0)
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
|
|
|
|
|
|
|
|
|
|
|
| |
It implements the setDirty function which is called by the transformed
plugin when the screen is rotated. The rotated image is in the surface
memory, just the bliting is done here.
Task-number: QTBUG-29949
Change-Id: I0be2d037d6e1ef85106175aa47cc548b99b05a94
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
| |
Low memory warning has been added for debug purposes.
Backport of 6b413dc32c485853710352a95e8bef928682558a
Change-Id: I79b3815d314227634b739935d85248cc526f2c89
Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Except for message box, which will have their optimal geometry calculated at
runtime.
This fix is not necessary on Qt5
Change-Id: Ida4743acdceb5424ab93aa3a32c78db61dd6795c
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
|
|
|
|
|
|
|
| |
This is a backport from qt5/qtquick1 (commit aad8f0b)
Change-Id: Ia3eacce5ccd50827526203a9992ddef81a9f0c41
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Went from taking 30 seconds to 2 seconds, on a SDCard with 10k files.
Windows file dialog does not resolve NTFS symlinks,
it just shows an empty icon, and the link name, not the target.
This allows for a big performance gain by reducing the number of
calls to GetFileAttributesEx() by checking the extension directly.
This also fixes the problems with the native file dialog, which
for some reason, is creating a QFileSystemModel too.
Task-number: QTBUG-13182
(cherry picked from commit 51f00deffac49c4277425837f0132b0c721bb689)
Change-Id: If7bd63d68e1870c5e48907ae79f4c4bdc6972b00
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
This patch reduces the number of calls to GetFileAttributesEx()
when icon lookup is being done.
The second bottleneck is a couple of isSymLink() calls. Will fix
that next.
Task-number: QTBUG-13182
(cherry picked from commit a7f6f32fadd5024697c16dfcbc07d6d11beb45fa)
Change-Id: If42b791d22fe0429a3b43992bad037afad09c448
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The handling of StyleChange de-maximizes the child window temporarily,
which was emitting subWindowActivated.
This would crash lokalize, because deactivating a window means deleting
the widgets associated with it, and style-change handling is done in
QApplication by looping over QApplication::allWidgets, which would then
contain dangling pointers.
Full valgrind log at https://bugs.kde.org/show_bug.cgi?id=271494#c7
Change-Id: I256da214bf00fd7925dcee67b4f0414e57fc453b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/a6e5ccbe223c5a606e15556e8708e863442d9f72)
|
|
|
|
|
|
|
|
|
|
|
| |
(backport of 108b9bbe2ff2f5f31525408a08d248499d95a49f in qtquick1)
Saving the int when we check the enum is valid allows us to make it a
literal assignment instead of a binding, which is much faster on object
creation.
Change-Id: Ieb174289438a17574c4716df372b04d4dee6d0db
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
|
|
|
|
|
|
|
|
|
| |
... otherwise we would not start reading from the beginning when the
device was reset.
Change-Id: I897adbad6e1f240fa871758ec7e3d6b499cb5944
(cherry-picked from commit ffe45f1896adfff93258b917f6a566dcc06a6597)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
... so SSL traffic can be decrypted with e.g. tcpdump / Wireshark.
For this to work, the define needs to be uncommented and QtNetwork
recompiled. This will create a file in /tmp/qt-ssl-keys which can
be fed into Wireshark.
A recent version of Wireshark is needed for this to work.
(cherry-picked from commit 1f180e9690a0a5f6cc849c1988ccda13de1b1e20)
Change-Id: I413ffd2494c780f92ccad7e4fdc11b790966e7ce
Reviewed-by: Richard J. Moore <rich@kde.org>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The crc.test and dwarf2.test scripts are now using the
SDK and arch settings passed to it. If you install Xcode
without the "UNIX Development" option, this is essential
to let the compiler find standard headers and let the test
program compile successfully.
In addition, let configure pass the SDK and arch settings
given on the command line to the scripts.
These scripts are no longer present in Qt 5.
Change-Id: I78c0b3594b91827a6618a9a152949e9201ca64c8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The purpose of PE_Frame is to draw the frame, not the background. The
old code tried to check whether a custom base brush was set, and
otherwise let the theme draw the background. That didn't work together
with CSS background images. This change removes the background drawing
from PE_Frame, and let's PE_Widget to draw the background using the
base brush that defaults to a color fetched from the theme.
Task-number: QTBUG-24783
(cherry picked from qtbase/f1e681bed21e131864fe1e1c91679f7a56b06823)
Change-Id: Ief256d1d5861abc95dedf0b5d0a4f8e338c48941
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
|
|
|
|
|
|
|
|
| |
patch not needed for Qt5
Task-number: QTBUG-27237
Change-Id: I41856f55b71661bfa01c4011129a35e110a234f9
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
|
|
|
|
|
|
|
| |
Scale by qt_mac_get_scalefactor.
Change-Id: I94cd4e0b2f81f7a83f14ff018e772dad1da10284
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
| |
userSpaceScaleFactor is deprecated.
Change-Id: I892cb579e4b3ef9226495759c884d0e74c85a1d6
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
If a line segment isn't filled we keep using the same point of origin.
Task-number: QTBUG-26156
Change-Id: I20af8410a7039b69848f201ab62fd3c01b95531b
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit b528e1324add2208abf8f83fb51a8bd2183157f5)
|
|
|
|
|
|
|
|
|
|
|
| |
Expanding on the change fixing QTBUG-24762 with the realization that any
line needs to be drawn in a consistent way regardless of system or
painter clip, not just dashed lines.
Task-number: QTBUG-25036
Change-Id: Ief7ef19cc92c52e7d792500a581a072ba032767e
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit c7191d3e214b9cdb17ec383b61f7e21e784f80d0)
|
|
|
|
|
|
|
|
| |
Backport of: a0c4a712263dbacd2c8d95da64e00bd213d05cbf
Change-Id: I4253067b42a8aa93325d48eeaa3a9937be2d2b75
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The problem was that the elapsed timer was not restarted,
causing the currentTime() not being adjusted for the time
it was paused.
(cherry-picked from Qt 5: 75614792fa2370b6b0402117bf)
Task-number: QTBUG-30108
Change-Id: I9718aa408075623514717328321c34e7ab3af436
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
The test has been recently failing in CI. The problem was easy to
reproduce in a virtual machine by resizing the window of the virtual
machine small enough. This change makes sure that the requested size
hint is significantly smaller than the desktop size, to avoid the
window manager stepping in and limiting the window size.
Change-Id: Id8ce63b2b88cbed964e0330633c5d2e1dc33598c
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
(cherry picked from commit 36e6632fa363152e1a0d42e53a0e5ada09092324)
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
|
|
|
|
|
|
|
|
|
| |
isSymLink() can be expensive in a few cases.
Change-Id: Ib8b9f0c13d7ce141a539a4729be81d9faa4382ea
Reviewed-by: David Faure (KDE) <faure@kde.org>
(cherry picked from commit 1975e65d73ef2bf225bd765e6b50b6f50167f71c)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
Emit activeFocusChanged up the focus tree when an item receives a focus
event, rather than when the focusItem changes which happens before
internal state is sufficiently updated for hasFocus and hasActiveFocus
to return the correct values from within a changed signal handler.
There are some limitions to this. First the signals are not emitted
reliably when the scene is not active which makes sense for activeFocus
but not for focus. The second is in some instances the focus and
activeFocus can update unnecessarily while the focus chain sorts itself
out.
QDeclarativeItem tests by Andreas Aardal Hanssen <andreas@hanssen.name>
Task-number: QTBUG-28288
Task-number: QTBUG-25644
(cherry picked from qtquick1/c520a69f06317fb90d37324bf284ef9614cb5dbf)
Change-Id: Iac12bf8c95cbf3525b454f4afca06a54a5c14b4e
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Andrew den Exter <andrew.den.exter@qinetic.com.au>
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
and isRunning() should return false.
This restore the Qt 4.7 behaviour
In Qt 4.7, the finished() was called with the thread's intenal mutex
locked. Which mean that:
- Call to isRunning or isFinished called from a slot connected to
finish within the thread would deadlock. (Hence no compatibility
to keep here)
- Call to isRunning or isFinished from a slot connected with
QueuedConnection in another thread would lock the mutex until
the destructors are finished. and then return as if the thread have
finished.
Change-Id: I963eccae8f7634aff90cc4bbab6ca886a78e35eb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry-picked from qtbase commit ec5e59b73c20a7dc6aec96c829f1e53c3fa58c07)
Task-number: QTBUG-30251
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
|
|
|
|
|
|
|
|
|
|
|
|
| |
Using || operator with #ifdef is incorrect. As a result, the
architecture for the user agent is incorrectly set to PPC on an Intel
Mac.
This is a partial backport of r128775 in WebKit upstream.
Task-number: QTBUG-30187
Change-Id: I6842f113fd024ababaf67e76dfee8f93e0988d08
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
|
|
|
|
|
|
|
|
|
| |
There is no definition for Yi, Tagalog...Braille in
QFontDatabase::WritingSystem, see the header file.
(cherry picked from commit qtbase b7b858595e6e2d8dcc9debeb45eb8b9b294b9be6)
Change-Id: I0d3625c58310d9af680799d20867f04b42845ca9
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
|
|
|
|
|
|
|
|
|
| |
The alpha cache needs to be cleared when starting a new paint otherwise
it will assume that some elements already exist in the PDF when they
don't.
Change-Id: I97451c53c0c99b80a25a057735cef7b3bb830a7a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
|
|
|
|
|
|
|
|
|
|
| |
For devices taller than 32768, fillRect with linear gradient would
go below the cliprect.
Task-number: QTBUG-26766
Change-Id: I516ede1545909e9ce2de5812c61bb473f99f5759
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
(cherry picked from qtbase/db775741ed57efc16c697471f5b87689df7105a8)
|
|
|
|
|
|
|
|
|
|
|
|
| |
We need to clip lines to the unclipped device rect in the case of
dashing, since otherwise the dashes will be shifted and rendered
differently when partial repaints are done.
Task-number: QTBUG-24762
Change-Id: I3599b54baa552acc20bf8cc2e12f846b45f6019e
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit a12f6ba302e54c1570c54aa4c722f2dafbf794af)
|