summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNetworkReplyImpl: optimize QRingBuffer allocationMarc Mutz2014-04-101-2/+2
| | | | | | | | | Use QSharedPointer<T>::create(), which co-locates the refcount with the payload in a single memory allocation, instead of QSharedPointer<T>(new T), which causes two allocations. Change-Id: I84980e98c4fe9773f12533983937eafa0b0ab250 Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* qdoc: Links to Q_DECL_FINAL not createdMartin Smith2014-04-091-0/+1
| | | | | | | | | | | | | | This update fixes part of QTBUG-37719. Q_DECL_FINAL is a macro that is documented, but links to the documentation for it were not created. The problem was that Q_DECL_FINAL is actually used in the Qt sources, but it was not listed in the Cpp.ignoretokens clause in the qdocconf file. This update just adds it to Cpp.ignoretokens. Task-number: QTBUG-37719 Change-Id: I62945df4976b21b67084e6de25e25bbc4c92f89f Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Remove some unused forward declarations.Jan Arve Saether2014-04-082-9/+0
| | | | | | Change-Id: I7816635ec37f3a70d23f0ab5aaf6c53481dbdbf9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QEvent: mark registerEventType() as no-throwMarc Mutz2014-04-072-2/+2
| | | | | | | | | The new implementation using an atomic bit field performs no memory allocations and thus cannot throw anymore. Change-Id: If6a98f307ab4e6a7c3fe3c54763ac0c6d2da4ac0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QEvent: optimize registerEventType()Marc Mutz2014-04-071-30/+70
| | | | | | | | | | | | | | | | | Instead of always searching from the end of the range [User, MaxUser], cache the next available id and start searching from there. Instead of saving the already-allocated IDs in a QSet, use an atomic bit-field. This removes the need to use a mutex. The QBasicAtomicBitField class is designed to be reusable, but lacks features that are not needed by QEvent::registerEventType(). It is also unclear how this could be made more encapsulated without losing the property that the whole instance is placed in the BSS segment, since making the data fields private will make the type non-POD. Change-Id: I4012fa114d9d9e85e9e881e100a2c021fa09a0d7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* [xcb/xsettings] Byte order byte is at address 0Egbert Eich2014-04-071-1/+1
| | | | | | | | | | Accoring to http://standards.freedesktop.org\ /xsettings-spec/xsettings-spec-0.5.html the byte order byte is address 0 (not 1). Change-Id: I441084a7f24908dd8a504648bfc50ba2d486a586 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Add missing \since 5.2 for qFloatDistanceJan Arve Saether2014-04-071-0/+2
| | | | | | | Task-number: QTBUG-38090 Change-Id: Icd46d7e3e95c9a019a94cfef3c51e3a6ee82bd91 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove qobject_cast to QDockWidget in QWindowsVistaStyle.Friedemann Kleint2014-04-071-5/+3
| | | | | | | | | | Rearrange checks in handling of CE_DockWidgetTitle to be consistent with the other styles. Task-number: QTBUG-37350 Change-Id: I8f5d11092eff96337ff1e685d3c42fbb2f128827 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Add QNonContiguousByteDeviceFactory::createShared()Marc Mutz2014-04-074-4/+49
| | | | | | | | | | for more efficient creation of QNonContiguousByteDevices held in shared pointers. Use the new functions in QNetworkAccessBackend::createUploadByteDevice() and QNetworkReplyHttpImplPrivate::createUploadByteDevice(). Change-Id: I8a3c76f7c8d5926850303992c77e9382a39a55e8 Reviewed-by: Richard J. Moore <rich@kde.org>
* QSharedPointer: allow one create() argument in C++98, tooMarc Mutz2014-04-072-3/+30
| | | | | | | | | | Survey says that most uses of QSharedPointer(T*) in Qt that could benefit from variadic create() pass only a single argument. In order to prevent all such uses from #ifdef'ing on the complex condition that enables the variadic version, provide a single-argument version (for lvalues only, obviously) for C++98, too. Change-Id: I22ad251a20bbf80867cc31eaa3bcec677bde4359 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Stabilize QListWidget testMarc Mutz2014-04-071-7/+1
| | | | | | | Shot in the dark, as usual. Change-Id: I272392e6d865f6b32047c3a0ebad70c0f007ba58 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add missing Q_DECL_OVERRIDEDavid Faure2014-04-051-4/+4
| | | | | Change-Id: Iffa196043d345d0b839a45635c0500d1abc3199c Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add function for setting the startup ID for the next window that will be shown.David Faure2014-04-053-0/+20
| | | | | | | | | This is useful for applications being requested to show a second window (e.g. via DBus) Change-Id: I04add2aa82dce63e854ba0f1c020274ed586bf1f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Add detection for the Intel compiler in QLibraryInfo::build()Thiago Macieira2014-04-041-1/+3
| | | | | | Change-Id: I26ed74ac963226abc42d50c0edac6ce9a1c0fd23 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Added handling of QT_LINUX_ACCESSIBILITY_ALWAYS_ON variable.Tomasz Olszak2014-04-042-1/+16
| | | | | | | | | | By setting this variable to non empty value we can, bypass checking ScreenReaderEnabled proprty of org.a11y.Status dbus interface. Not all accessibility readers set this. The variable is also useful for debugging. Change-Id: I6c5a1a51065948248e068dfff4755d6818ed9fb1 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* QWeakPointer: add member-swapMarc Mutz2014-04-034-0/+40
| | | | | | | | [ChangeLog][QtCore][QWeakPointer] Added member-swap function. Change-Id: Ide3672dc74a9d8153e5f930290d938e8c23993b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QWeakPointer: add lock() for std::weak_ptr compatibilityMarc Mutz2014-04-034-0/+30
| | | | | | | [ChangeLog][QtCore][QWeakPointer] Added lock() method for std::weak_ptr compatibility. Change-Id: I0851d91c51f5a4f04a855a1d8082234ce38396b4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Optimize QColor::setNamedColorJędrzej Nowacki2014-04-032-7/+15
| | | | | | | This patch removes two memory allocations from the algorithm. Change-Id: I9366f9c5ce02fb1cae8adfbd8dff36c7f23af2a7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* [xcb/xsettings] Add support for byte swappingEgbert Eich2014-04-031-11/+32
| | | | | | | | | | | | | | | | | | | The XSettings protocol is not endian neutral. Instead it holds information about endianness in the first byte. It uses the same convention as X11/X.h does. So far byte order handling was missing leading to nasty crashes when byte order between clients setting and reading XSettings differed. This patch fixes this. Using the X11/X.h conventions seems to be an 'established standard', this piece is missing from the Xsettings specifications. Therefore this fix may introduce spurious regressions as other Xsettings 'providers' may use a different convention. To detect this and to avoid crashes the fix also adds checks to avoid reading past the end of the of the Xsettings data blob. If problems are encountered: warn and bail. Change-Id: If8acb23cca2478369633129af2d99e122a84cede Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* QPainter: Fix a hard to trigger null dereference in ↵Robin Burchell2014-04-031-0/+2
| | | | | | | | QPainterPrivate::drawTextItem. Done-with: Mohammed Hassan <mohammed.hassan@jollamobile.com> Change-Id: I24c724d24346fb5be8c4a66d68a11d51be5ad5f2 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Serialize QPicture using the latest QDataStream version.Mitch Curtis2014-04-022-25/+84
| | | | | | | | | | | | | | | | | The QDataStream version with which QPicture was previously serialized with was hard-coded to 11 (Qt 4.5). This prevents features of serializable types used by QPicture from being serialized if they were added after Qt 4.5; namely features of QFont like HintingPreference. [ChangeLog][QtGui][QPicture] QPicture now serializes its data properly by also accounting for QDataStream versions greater than Qt 4.5. Task-number: QTBUG-20578 Change-Id: Idd27682b187f4d4a3695c52bbf68e84853c024a8 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QColor::colorNames(): reserve the result QStringListMarc Mutz2014-04-021-0/+1
| | | | | | | | | Avoids reallocations. Change-Id: I56afcdb400d1e07394e62a610f838a33feda9fe8 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Fix warnings produced by QT_ASCII_CAST_WARNINGS in widgets/accessibleJan Arve Saether2014-04-021-21/+21
| | | | | | Change-Id: Ibd468f6f7b4f8b5c4776655d33f27989bafa9b58 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* IBus: Implement IBus' surrounding text featureTrung Ngo2014-04-022-2/+57
| | | | | | Task-number: QTBUG-37540 Change-Id: I5aacaedff3ada57f6f2c09b0d856340b1a25d1e5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* IBus: Implement QDBusArgument serialization operatorsTrung Ngo2014-04-024-48/+132
| | | | | | Task-number: QTBUG-37540 Change-Id: Idbe952dbd9851dde2c4aee0662d845996bf0c36a Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* IBus: New version of IBus.InputContext DBus declaration fileTrung Ngo2014-04-023-4/+23
| | | | | | Task-number: QTBUG-37540 Change-Id: I9977198b15c0f827b7483f4131c45fe2a86e8ef5 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Iikka Eklund2014-04-02205-2131/+4043
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/stable' into devIikka Eklund2014-04-01205-2131/+4043
| |\ | | | | | | | | | Change-Id: I2a6eb9dd7724931bc89f28bcc156e77c4e26d069
| | * Item views: respect selection mode when closing an editorJ-P Nurmi2014-04-012-2/+45
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31411 Change-Id: I1a52eb739e0bc2afa7227f006461916df8ecaf48 Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
| | * Item views: respect focus policy when closing an editorJ-P Nurmi2014-04-014-11/+63
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-31411 Change-Id: Ib0a72755c35a553653ea014672d59979a550b7ae Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
| | * Add support for device capabilities on WinRTMaurice Kalinowski2014-03-311-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WinRT distinguishes between regular capabilities and device capabilities. For now the latter section are location, microphone, proximity and webcam. Hence we must add those properly to the generated manifest. However, Windows Phone currently combines all of these into the Capability section, so add a warning if someone uses devicecapabilities for Windows Phone. Task-number: QTBUG-37932 Change-Id: I8e9550f29b6afdea3737cc85bdc68344fc04223d Reviewed-by: Andrew Knight <andrew.knight@digia.com>
| | * d3dcompiler_qt: Improve shader source structureAndrew Knight2014-03-311-22/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following adjustments are made: - A precompiled path, defaulting to a QRC path, is added for looking up precompiled shaders - The standard service source/binary paths are created if needed, in order to avoid fast-fails when the service cannot create the structure itself fast enough. Change-Id: I966e54c0b35bafdaf0b3a32b76eb896308aca6db Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
| | * Propagate textureChildSeen properlyLaszlo Agocs2014-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | even if setParent() is not called afterwards. Change-Id: Ie54e227c7adda2710fbd46176e9a15252aef2985 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| | * Make tst_qopengl more verbose.Friedemann Kleint2014-03-311-28/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add more checks, compare size of converted images. Task-number: QTBUG-31611 Change-Id: I995071f4be097c08aa2917be03fd7196882ae2c2 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * Send touch update events to widget if there is a gesture pending for it.Friedemann Kleint2014-03-313-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise, touch update/end events were ignored and the gestures were never triggered (unless a native widget was used). Task-number: QTBUG-37759 Change-Id: I4b0145ffe535065e1458164b67bc8d9e33a4af97 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * Make QWindowsMultiFontEngine support deferred fallback families queryKonstantin Ritt2014-03-313-33/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This finishes 800232e1d3ebfbac28d07014a3c646ea00fcf6ad, which encovered a tricky issue in QFontEngineMultiQPA::createMultiFontEngine(). Task-number: QTBUG-37836 Change-Id: I6d432e09e755f5d9ded09752c4c092f4857ad224 Reviewed-by: Pierre Rossi <pierre.rossi@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Fix QFontCache::Key comparison for custom font fallbacks caseKonstantin Ritt2014-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | Just a C&P typo, of course we have to compare lists, not their sizes. Change-Id: I40542035b87f5bb8d75207cb02c0826cc3a2a413 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Drop dead codeKonstantin Ritt2014-03-311-4/+1
| | | | | | | | | | | | | | | | | | | | | The QFontEngineMulti's `base` font engine always non-null. Change-Id: I5092b66bc839a6a3216ffa0b0afe55a8b62be620 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Android: input method fixes for SwiftEdit keyboardPaul Olav Tvete2014-03-311-10/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Report correct pre-edit information when calling updateSelection() on endBatchEdit() * Fix getExtractedText() to report the correct offset and cursor position, * Fix setSelection() to use the correct cursor position. Task-number: QTBUG-35689 Change-Id: I7e8427d0f5a18abf18ba2faf9d510756ddf6044b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
| | * iOS: Share default-FBO for windows between contexts in a share-groupTor Arne Vestbø2014-03-311-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current implementation of QOpenGLContext sharing assumes that the contexts form a tree and that leaf-nodes are destroyed before their parents. We build on this assumption and keep track of the default FBOs for windows in the root context of the tree. This allows two shared contexts to both makeCurrent() on the same window surface without resulting in two FBOs being set up (which doesn't work on iOS due to the CEAGLLayer already being tied to another render-buffer). Change-Id: Ib9f8c597effe488480fe99e10846be22c257f490 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| | * QNX: use QStringList::join(QChar) overloadMarc Mutz2014-03-311-2/+2
| | | | | | | | | | | | | | | | | | | | | Doesn't construct a temporary QString. Change-Id: I368c5f997f74c1ce6b2930ac4df292c7a6d5c87c Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Update copyright year in tools outputKai Koehne2014-03-314-7/+7
| | | | | | | | | | | | | | | | | | Change-Id: I9ee9604303b3cb29f89a4252df5af35e729f6249 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * Updated outdated README for thread examplesKai Koehne2014-03-311-8/+6
| | | | | | | | | | | | | | | | | | Change-Id: I3fa8ac350dc89546793d49a31cc5a152c1f55958 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
| | * Update copyright year in LICENSE.LGPLKai Koehne2014-03-311-1/+1
| | | | | | | | | | | | | | | | | | Change-Id: I38c4512751de33d813567bf41b249a7123c9a38a Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com> Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
| | * Fix compile for embedded Androidaavit2014-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | It also has a broken declaration of posix_memalign Change-Id: Ie8f245564f80b04901425729b46953828204efaf Reviewed-by: Andy Nichols <andy.nichols@digia.com>
| | * OS X QSettings auto test/writing check updateSamuel Gaist2014-03-313-22/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch aims to provide an updated test that follows changes started in 10.7: new rule is that only root can access SystemScope settings. It also disables the sync() workaround code path which is at least not executed during the tst_QSettings execution and returns wrong value to the test. From Apple's documentation: "Note that modification of some preferences domains (those not belonging to the “Current User”) requires root privileges (or Admin privileges prior to OS X v10.6)—see Authorization Services Programming Guide for information on how to gain suitable privileges" https://developer.apple.com/library/mac/documentation/CoreFoundation/Reference/CFPreferencesUtils/Reference/reference.html [ChangeLog][QtCore][QSettings] QSettings now returns the correct value for isWritable() when using SystemScope settings. Task-number: QTBUG-9824 Task-number: QTBUG-21062 Task-number: QTBUG-22745 Change-Id: Ib6a1490ec596b99d189ec4de9a0f28ecfd684172 Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Add documentation for WINRT_MANIFESTMaurice Kalinowski2014-03-311-0/+112
| | | | | | | | | | | | | | | | | | | | | | | | Basically a copy of the inline documentation inside the prf file. Task-number: QTBUG-37788 Change-Id: Ie6df1597297223be778c748aad525f5521232cb7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
| | * NSScreen screens may be empty so add the main screen in that caseAndy Shaw2014-03-291-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some circumstances NSScreen screens can be empty yet there is still a valid main screen so we prevent any problems arising by ensuring we work with the main screen in that instance. Task-number: QTBUG-37876 Change-Id: I5827009a9894eb8c1d4f5addc6c6f59e1c50c3d0 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * XCB: use requested primary screen DISPLAY=:0.1 when possibleDavid Fries2014-03-291-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic requires primary->output to not be specified, or match the output number. This fails when the output by that number doesn't currently have a display attached, as non-connected outputs are skipped. This means setting the display to :0.1 for Qt5 will put the window on :0.0 and it can't be moved to :0.1 after the fact. The solution is to pick the first output on the requested screen, then override if an output exactly matches the primary output value. That way it will at least be on the requested screen. Tested with Xephyr, ATI, and nVidia (proprietary driver), where the nVidia had the primary output disconnected. Task-number: QTBUG-15418 Change-Id: I7951dcef74cb135dc12a6e133a71c5852eae9778 Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * If no screens, attempting to create a window results in clean exitShawn Rutledge2014-03-293-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Asserting is only relevant for debug builds, and there were a couple of other places that a segfault would typically occur before the assert had a chance. Change-Id: I1abc82eb3ecfa91050117fab1525f4cbd82ff486 Task-number: QTBUG-37876 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 16:28:54 +0000