- 05 Nov, 2014 - 7 commits
-
-
Thiago Macieira authored
We don't need two anymore because they now protect the same thing: the state of the DBusConnection. The difference existed when it was possible for two threads to access the DBusConnection at the same time: one doing dispatching and one doing something else. Unfortunately, even though DBusConnection supports this, QtDBus doesn't. From d47c05b1889bb4f06203bbc65f4660b8d0128954 (2008-10-08): Details: if we're removing a timer or a watcher from our list, there's a race condition: one thread (not the QDBusConnection thread) could be asking for the removal (which causes an event to be sent), then deletes the pointer. In the meantime, QDBusConnection will process the timers and socket notifiers and could end up calling lidbus-1 with deleted pointers. That commit fixed the race condition but introduced a deadlock. Task-number: QTBUG-42189 Change-Id: I034038f763cbad3a67398909defd31a23c27c965 Reviewed-by:
Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by:
Albert Astals Cid <albert.astals@canonical.com> Reviewed-by:
Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-
Thiago Macieira authored
We lock it before dbus_connection_send_with_reply (the async version) in QDBusConnectionPrivate::sendWithReplyAsync. We weren't locking it before send_with_reply_and_block and we apparently should. The locking around the dbus_connection_send function might not be necessary, but let's do it to be safe. The lock now needs to be recursive because we may be inside QDBusConnectionPrivate::doDispatch. Task-number: QTBUG-42189 Change-Id: I7b6b350909359817ea8b3f9c693bced042c9779a Reviewed-by:
Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by:
Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
-
Kai Koehne authored
QString::sprintf does actually support all length modifiers, including %lld. The format string is also parsed as UTF-8. What's worthwile to mention, though, is that %lc and %ls is at odds with the standard, since wchar_t isn't necessarily 16 bits wide. Change-Id: I30cd22ec5b42035824dd98e3cdcc79d7adcc953a Reviewed-by:
Olivier Goffart <ogoffart@woboq.com> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
Simon Hausmann authored
Amends commit 9c3a58a9 . Change-Id: I292eb9df480a642a65f9065e4fe36bd52c093dc7 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
Raphael Kubo da Costa authored
Most of the settings there end up overwritten by the clang.conf include that comes afterwards, except for a few things such as QMAKE_LINK_C, which remains set to "gcc" and breaks things when one uses CONFIG=use_c_linker. QMAKE_LFLAGS_NOUNDEF was coming from g++-unix.conf, though, so we now manually set it in freebsd-clang's qmake.conf. Change-Id: Ibd16f59d43eb19e72adf4919da9ce3007100b60f Reviewed-by:
Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
Raphael Kubo da Costa authored
While it does not look like the clang-based mkspecs had any problems so far with not having QMAKE_LINK_C and QMAKE_LINK_C_SHLIB defined, it makes sense to set them to $$QMAKE_CC just like the GCC-based ones so CONFIG=use_c_linker works as expected. Change-Id: Ib660d12b001dd7a877b6f03e79715db08a272968 Reviewed-by:
Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
-
Marco Martin authored
Panels windows are usually outside QScreen::availableGeometry, because they will usually set extended struts to reserve the screen area for themselves, but their own screen() must remain the one in which they are. This cause one downstream behavior to KDE https://bugs.kde.org/show_bug.cgi?id=339846 in which a panel got by mistake few pixels on another screen, and was immediately reassigned to that screen, because its geometry was intersecting the new screen availableGeometry() but not the geometry of its own screen, because itself reserved its own geometry away from availableGeometry() Change-Id: If6c9defdef62732473687dd336dbcec582bd0ea2 Reviewed-by:
Jørgen Lind <jorgen.lind@digia.com>
-
- 28 Oct, 2014 - 8 commits
-
-
Alexander Volkov authored
\omitvalue does not allow a description of an enum item, so move the description as a comment to the enum declaration. Change-Id: I4192b16e41b704cbad66c0eeafcb141087d2ba65 Reviewed-by:
Martin Smith <martin.smith@digia.com>
-
Joerg Bornemann authored
The settings of the librarian were never written. Creation of static libraries only worked by accident. Adapted the code from the vcproj code path. Task-number: QTBUG-30712 Change-Id: I69917f44305eb458647392d222db477fe5a5b7c8 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by:
Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by:
Andy Shaw <andy.shaw@digia.com>
-
MihailNaydenov authored
Task-number: QTBUG-41623 Change-Id: I4e0640a7739d0ce4f8758dd5d8d17882a6947467 Reviewed-by:
Alessandro Portale <alessandro.portale@digia.com> Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Joerg Bornemann authored
Change-Id: Iec6d6ca121b2b04fc1eb4a97f1387ee630e6e1f5 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com>
-
Oswald Buddenhagen authored
... to avoid that inherited MAKEFLAGS turn out to be incompatible with the make we choose. Task-number: QTBUG-39527 Change-Id: I47d4cec58b0643cc5d97868e70b24f7f37e964bb Reviewed-by:
Joerg Bornemann <joerg.bornemann@theqtcompany.com>
-
Volker Krause authored
This is hit in case of a recursion in the message handler, and message hasn't gone through qMessageFormatString at this point and thus lacks the newline. Change-Id: Ia098b6ccbcc1aff22a4695865f39143ba0152d9c Reviewed-by:
Kai Koehne <kai.koehne@theqtcompany.com>
-
Steffen Imhof authored
Added some #ifdef guards around usages of composeMode(). Change-Id: If2f2d3cae21b270933b38ea67dcc885f5871785f Reviewed-by:
Marc Mutz <marc.mutz@kdab.com>
-
Steffen Imhof authored
Change-Id: I7f0bfed4ff9a608575cf6795016b2fa134fd273f Reviewed-by:
Marc Mutz <marc.mutz@kdab.com>
-
- 13 Oct, 2014 - 5 commits
-
-
Lorn Potter authored
Task-number: QTBUG-41813 Change-Id: I977facc2ee59571d24e60ac9d5d41e957403b344 Reviewed-by:
Richard J. Moore <rich@kde.org>
-
Gabriel de Dietrich authored
As usual, this includes small and mini control sizes. Flat and oversized buttons will fall back to the HITheme rendering for now. Task-number: QTBUG-40833 Change-Id: I08d67c48b2e72681af4dc4a37ea498f7aac1dca0 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Maximilian Hrabowski authored
The check for Qt::Key_A to handle selectAll was changed to directly compare to QKeySequence::SelectAll as this will only match Ctrl. The former implementation also triggered when e.g. Shift was pressed. Added a check that selectAll is only called when selection is not disabled, i.e. selectionMode=NoSelection. Added a unit test for selectAll(). Task-number: QTBUG-26687 Change-Id: I721e7ab590b55d7d754b3b74ef01756fa5aa1315 Reviewed-by:
Olivier Goffart <ogoffart@woboq.com>
-
Dyami Caliri authored
qt_drawFocusRingOnPath was saving the graphics state after setting a new context. This leads to zombie NSBitmapGraphicsContext access with QFileDialog. Task-number: QTBUG-41879 Change-Id: I7fc7d959d2b0f01cb3491d639023083f1b46d175 Reviewed-by:
Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Giuseppe D'Angelo authored
There's a code path which reads that member before it got anything assigned to it, triggering undefined behavior. The code path goes as follows: 1. an instance is created in QFSFileEngineIterator::advance 2. the instance is passed to QFileSystemIterator::advance, which fills in only some members (not size_) 3. the instance is passed to QFileInfoPrivate which does a deep copy, reading an uninitialized size_ Change-Id: I6835ee701a83b63ca4bad6235feeb6a23566fcd3 Reviewed-by:
Marc Mutz <marc.mutz@kdab.com> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
- 06 Oct, 2014 - 1 commit
-
-
Giuseppe D'Angelo authored
The code shifts "1" by a uint32 number. If that number is >= 32, we're triggering undefined behavior, and Coverity rightfully complains about that. Add some asserts to silence those warnings. Change-Id: Ib91085a279b0a2b7ad37afad05ec1d764c0496b1 Reviewed-by:
Uli Schlachter <psychon@znc.in> Reviewed-by:
Shawn Rutledge <shawn.rutledge@digia.com>
-
- 03 Oct, 2014 - 1 commit
-
-
Topi Reinio authored
Fix a minor mistake in the the function parameter documentation, and add a code snippet. Task-number: QTBUG-39782 Change-Id: Ia5d88a983ad683ae5bde9f332d51adc4afda77a8 Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com> Reviewed-by:
Alex Blasche <alexander.blasche@digia.com>
-
- 02 Oct, 2014 - 1 commit
-
-
Timur Pocheptsov authored
On Yosemite checkable toolbuttons look differently when highlighted - this modification tries to imitate such look without pixmaps we used on OS X >= 10.5 && < 10.10. Change-Id: I0fcdff42a67fa6d5188c9dc64401f0f27ae60b5d Reviewed-by:
Gabriel de Dietrich <gabriel.dedietrich@digia.com>
-
- 01 Oct, 2014 - 15 commits
-
-
Kai Koehne authored
MSVC 2013 complains about the use of 's' if a variable 's' is already defined in the context: error C2373: 's' : redefinition; different type modifiers error C3493: 's' cannot be implicitly captured because no default capture mode has been specified This looks like a compiler bug. Anyhow, it's easy to avoid the clash in most cases by using a more distinctive name ... Task-number: QTBUG-41706 Change-Id: Iaff1b6d37897fa8cf9e4913effa0498f9fd7bb07 Reviewed-by:
hjk <hjk121@nokiamail.com> Reviewed-by:
Olivier Goffart <ogoffart@woboq.com> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
Oswald Buddenhagen authored
otherwise we'll produce lines with tens of thousands columns when dealing with QMAKE_BUNDLE_DATA. Change-Id: Ia2a70f25e4ee1d3fe976027a7c46d234809a3f70 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
with qmake now de-duplicating the paths properly, we should version these QMAKE_BUNDLE_DATA entries as well, so we don't depend on the symlinking of the regular headers being done first. Change-Id: Idaa2ccc1ba9b5684b0c8d84f7f760735f54432e1 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
According to Apple's documentation [1], framework bundles don't have a 'Contents' folder. Instead, each version folder gets a 'Resources' folder which contains the Info.plist file, and which is also symlinked at the top-level framework folder. [1]: https://developer.apple.com/library/mac/documentation/macosx/conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32895 Change-Id: I5e55cc097b179012add0ceb7c567dace8e282895 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
the target path may have multiple components, e.g. Headers/private. obviously, only the first component must be linked in such cases. Task-number: QTBUG-32895 Change-Id: If632b3b72c170a9fde36e62c165e06ded53deda3 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
multiple QMAKE_BUNDLE_DATA entries can install into the same directory, but it obviously makes no sense to symlink that repeatedly. Change-Id: If65f7acdf4e158e33511917a027a380e642e2f28 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
instead of duplicating the plist/icon/bundled_files logic just to obtain the dependencies, create them as a side effect of the actual target creation. Change-Id: I6a0fe26c82c490b1040a7a06d5d0e7a4567ae1af Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
Change-Id: Iff2c6686eae47e09fa6d046c60523aaf79aadfd5 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Morten Johan Sørvig authored
Add @FULL_VERSION@ -> Qt version substitution to unixmake2. This makes the Qt-generated Info.plist files compliant with the bundle signing/validation process. Task-number: QTBUG-32896 Change-Id: I1818f028c2f740d699629dd78cc0fe6ffaf94a1c Reviewed-by:
Jake Petroules <jake.petroules@petroules.com> Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Gabriel de Dietrich authored
We do so by setting a 'no_plist' config property. Can be overridden with 'force_debug_plist'. The debug version of Info.plist would overwrite the release version, and it also happens to contain invalid data. In particular, CFBundleExecutable would contain the _debug suffixed libname, which it shouldn't. See the entry about CFBundleExecutable on https://developer.apple.com/library/ios/documentation/general/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html Task-number: QTBUG-32894 Change-Id: Ideb018e4768a7c4e276e1b07d77937451f6db6a2 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I353fb4eafc014bccdec71af42f8625b33488ae0d Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I97f9d87cb5a114bf4764f13f0fd0d22e9b4da96f Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
Current already points to the major version, and the other symlinks are supposed to take advantage of that (so a hypothetical change of major versions requires just one symlink to be adjusted). https://developer.apple.com/library/mac/documentation/MacOSX/Conceptual/BPFrameworks/Concepts/FrameworkAnatomy.html Task-number: QTBUG-32895 Change-Id: I3c3a38c72ba18de6e48b20f2662341672022a274 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
this allows us to extend its dependencies, which we will make use of later. Change-Id: I8809bdffb435455338e88e97049b10beeab0468a Reviewed-by:
Morten Johan Sørvig <morten.sorvig@digia.com>
-
Oswald Buddenhagen authored
it's QMAKE_DIRLIST_SEP and DIRLIST_SEPARATOR. pure evil. Task-number: QTBUG-41668 Change-Id: Ie2f6db6530e0f50bc1ce5db593180e7ad703766b Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
-
- 30 Sep, 2014 - 2 commits
-
-
Dyami Caliri authored
Windows accessibility can crash if it handles an event with an invalid QAccessibleInterface pointer (one whose object has been deleted). Task-number: QTBUG-41597 Change-Id: Iba099f7cb732fd00f18f04bd951c6cdd94785871 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by:
Jan Arve Sæther <jan-arve.saether@digia.com>
-
Eskil Abrahamsen Blomfeldt authored
Say you have a document of two blocks of text. When you select a block of text in the document and then replace this with a new empty block (by pressing enter) and then subsequently undo this action, the following three steps are performed as a chain of undo commands: 1. Remove the empty block at the beginning of the document 2. Insert a new empty block at the beginning of the document 3. Insert the text back into the first block Since a block is removed and inserted in the same go, both blocks require a relayout, since the accumulated change spans both blocks. However, in QPlainTextDocumentLayout we would only look at the max of either removed chars or added chars. This would match the text length of the first block at this point, so we would only relayout that block. However, since we are also removing characters, the actual accumulated change to the document is larger. We should relayout any block touched by the sum of the added and removed character counts. Missing this, the paint event would later query block.layout()->lineForTextPosition(0) which would give an invalid line despite the fact that the block.length() > 0. This caused a crash in the paint event when the full width selection was turned on. Note that the logic here was only recently updated to include the removed characters at all in the logic, by the SHA1: 2983cb95 . [ChangeLog][QPlainTextEdit] Fixed a crash when using full width selections and issuing a complex undo command chain which removes and inserts an empty block in one go. Task-number: QTBUG-36415 Change-Id: Iafe8a69e455e0c713a48714f10f0cace69c84f51 Reviewed-by:
Axel Rasmussen <axel.rasmussen1@gmail.com> Reviewed-by:
Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by:
Simon Hausmann <simon.hausmann@digia.com>
-