summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor plugin loading for WinRTMaurice Kalinowski2013-11-055-2/+46
| | | | | | | | | | | | | | | | | Specify the root directory to be the package root. Only plugins inside the root can be opened (actually also only files). Furthermore current defaults to the package root now, which in most cases is identical to previous behavior. When attempting to load a plugin the path can either be specified in host format "C:/..." or as plugin absolute "/platforms/...". Check for both, with preference of latter case, like when qt.conf is used with / being used as plugin path. Change-Id: I7e3da293362488b62a3357c4882ebf5e048dcf95 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* WinRT compatibility functions: properly return ERANGE from getenvAndrew Knight2013-11-041-1/+1
| | | | | | | ...when the buffer's size is smaller than the value size. Change-Id: Id345982c9fc4ceed6505d0c192680c47c554fcb4 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* WinRT: Remove Windows metadata flags from common mkspecAndrew Knight2013-11-041-2/+2
| | | | | | | Winmd is not used, so there is no reason to embed it. Change-Id: I0820256aecd9c3c71b0b0c8afa53941b03f97363 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Fix QTimeZone test compilation on WinRTAndrew Knight2013-11-041-1/+1
| | | | | | | | WinRT doesn't use the Windows Timezone backend, so don't build the Windows test. Change-Id: I32620546de3ad1f19402cc1359f8038200c915ec Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Replace use of putenv in test caseAndrew Knight2013-11-041-2/+1
| | | | | | | This should be using qputenv; putenv is deprecated on MSVC. Change-Id: I7c27cf5f7955624fa3553b7a34ab11c6fae462b8 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Ignore debugger arguments on WinRTMaurice Kalinowski2013-11-011-0/+4
| | | | | | | | | Visual Studio debuggers send an argument to specify the debugger port. This argument needs to be skipped while parsing and not to be interpreted as an option or test function. Change-Id: I24efb52fbd668a7bc3388c876f5ea0d950de1d5b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Avoid adding empty argumentsMaurice Kalinowski2013-11-011-5/+7
| | | | | | | | QByteArray split does create one item even if the string is empty. Hence check if the launch arguments string needs to be parsed at all. Change-Id: I0a355212aaa7254fe0f417c61a59c30223311915 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QThreadPool: fix race at time of thread expiry.David Faure2013-10-313-22/+34
| | | | | | | | | | | | | | | | | | | | The current synchronization mechanism was racy: decrementing waitingThreads and then hoping that the wakeOne will wake a thread before its expiry timeout happens. In other words, on timeout, a just-assigned task would never run. And then no other task would run, if maxThreadCount is reached. Fixed by using a queue of waiting threads (rather than just a count), and by moving the wait condition into the thread itself, so we know precisely which one we're waking up, and we can remove it from the set of waiting threads before waking it up, and therefore it can determine on wakeup whether it has work to do (caller removed it from the queue) or it expired (it's still in the queue). This is reliable, whereas the return value from QWaitCondition::wait isn't reliable, when the main thread has already decided that this thread has work to do. Task-number: QTBUG-3786 Change-Id: I1eac5d6c309daed7f483ac7a8074297bfda6ee32 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QPlainTextEdit: use QSignalBlockerMarc Mutz2013-10-301-9/+13
| | | | | Change-Id: I581e60c4efd985fb909614459229806185f9501c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QMenu: use QSignalBlockerMarc Mutz2013-10-301-2/+2
| | | | | Change-Id: I41006d2b6f1454382b8c0bede20999d882b66f26 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QFontComboBox: use QSignalBlockerMarc Mutz2013-10-301-3/+4
| | | | | Change-Id: I6a9eab39088275427e4282ee590fda439b2f2901 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QTreeWidget: use QSignalBlockerMarc Mutz2013-10-301-3/+2
| | | | | | Change-Id: I0b69cd5680dfae6349bd4a952f358fe0b4acb2ff Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QInputDialog: use QSignalBlockerMarc Mutz2013-10-301-4/+5
| | | | | Change-Id: I711dbc0c35bc51ad3149e3d7b41e716bc9ab94b5 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QPrintPreviewWidget: use QSignalBlockerMarc Mutz2013-10-301-3/+4
| | | | | Change-Id: Ic2d48c8e2c9c3c6f06e67ebf7e12bd4899b421aa Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QTabWidget: use QSignalBlockerMarc Mutz2013-10-301-2/+1
| | | | | Change-Id: I4621e6b504c531903210242cf0f1cf12e7538784 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QMdiArea: use QSignalBlockerMarc Mutz2013-10-301-2/+1
| | | | | Change-Id: I54bb64531b1b9639bec163a96baae67b9cabd16b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QDockAreaLayout: use QSignalBlockerMarc Mutz2013-10-301-3/+1
| | | | | | | | | | This change changes the point where signals are unblocked again in QDockAreaLayoutInfo::updateTabBar() to include the final tabBar->count() call. This should not be a problem, as count() is a const function and thus shouldn't emit any signals. Change-Id: I6f3dc5696a9c31db51fbe4cdee4b9d83ddeaf61f Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QDateTimeEdit: use QSignalBlockerMarc Mutz2013-10-301-7/+3
| | | | | Change-Id: I4983e96a51220f40644d202d76e92a889ae9431a Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QAbstractSpinBox: use QSignalBlockerMarc Mutz2013-10-301-4/+2
| | | | | | | | | | This change changes the point where signals are unblocked again in QAbstractSpinBoxPrivate::updateEdit() to include the final update() call. This should not be a problem, as update() merely posts an event and shouldn't emit any signals. Change-Id: I4b2ae109f057792b573ad6ea168ca77c18c773d0 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QFontDialog: use QSignalBlockerMarc Mutz2013-10-301-4/+2
| | | | | Change-Id: I7be3ac4a7e6988d768e1db68f10a6920aa825a76 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QFileDialog: use QSignalBlockerMarc Mutz2013-10-301-2/+1
| | | | | Change-Id: I32a631493138a777458557232da084f497adc526 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QColorDialog: use QSignalBlockerMarc Mutz2013-10-301-3/+1
| | | | | Change-Id: Id680d9b934760cdd6a20579518199bd388b56e5d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QItemSelectionModel: use QSignalBlockerMarc Mutz2013-10-301-2/+1
| | | | | Change-Id: Ib88db7516fd7dd8f10a86444c506f3294948e79b Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* QSignalBlocker: (new) RAII class for QObject::blockSignals()Marc Mutz2013-10-304-0/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | I don't think I ever worked on a project of non-trivial size that didn't at some point add a QSignalBlocker. This commit adds code, tests and documentation. Later commits will convert naked blockSignals() calls to use QSignalBlocker. The implementation is purely inline to avoid the heavy overhead of cross-dll function calls for this miniscule task. This should not be a problem because QSignalBlocker only uses public API and a pattern that we anyway need to keep working until Qt 6, at least, so even changing the implementation later will be no problem as the old implementation lurking in non-recompiled code will be acceptable, too. This implementation is an evolution from KDTools' KDSignalBlocker, with the following changes: - Implements unblock() and reblock() - Uses the return value of blockSignals() instead of a separate signalsBlocked() call. Change-Id: I1933dfd72a0f5190324be377cfca3c54cf3d6828 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Doc: update the documentation of QStandardPaths to be more thoroughThiago Macieira2013-10-291-20/+178
| | | | | | | | | | Specifically, note what paths can be empty and which ones can't (modulo system mis-configuration, like an empty $HOME var) and describe what implications there are for application-specific paths and for global (user) paths. Change-Id: If6c11aab466ba50f3a9685dce52dd51b86426f27 Reviewed-by: David Faure <david.faure@kdab.com>
* added QAbstractSpinBox::setGroupSeparatorShown function.Oto Magaldadze2013-10-298-8/+163
| | | | | | | | | | | [ChangeLog][QtWidgets][QAbstractSpinBox] QTBUG-5142 - This will allow a group (thousand) separator to be shown in QSpinBox and QDoubleSpinBox widgets. Task-number: QTBUG-5142 Change-Id: I2e23f5f83c93bb092a2dbd784e06d17d40d42909 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QLCDNumber: remove unused header #includeMarc Mutz2013-10-291-1/+0
| | | | | Change-Id: Ic1608a11a48c373b7ad816c1305cce0fe236425b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Improve mapping between Font Config and Qt font attributesRoger Maclean2013-10-271-17/+50
| | | | | | | | | | | | | | | | | | | | | | | It was sometimes impossible to select the desired font due to the code completely ignoring the FC_WIDTH attribute and poor mapping of the FC_WEIGHT attribute. The result was that it was easy to have a font file that was inaccessible by Qt since it shared attributes with another font file. The FC_WIDTH attribute is now fetched and used unchanged as the font's stretch value other than ensuring it is within the allowed range. For FC_WEIGHT, the code no longer matches the value with the closest QFont::Weight enum but instead does a piecewise linear mapping so that Qt enum values match Font Config ones to the extent possible. Also removed bogus call to fetch the width that was doing nothing with it. Change-Id: Id39715f14a617c1d0e00ecf5a7d391cab99adc03 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Bernd Weimer <bweimer@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Add empty dist/changes-5.3.0 fileMarc Mutz2013-10-261-0/+29
| | | | | Change-Id: Iea2f6bb3b1d5c922167c4e96c825c08db9aa1b4e Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* QPrintSupport: Move QAbstractPrintDialog test into QPrintSupportJohn Layt2013-10-266-3/+4
| | | | | | | Move the test for QAbstractPrintDialog from widgets into printsupport Change-Id: Ia7595fa650a7ad565df3090207500ed06564e842 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Add configuration for building with imf support on QNXRoger Maclean2013-10-254-2/+92
| | | | | | | | | | Avoid need to modify qnx.pro in src/plugins/platforms/qnx to build with imf support. By default detects if necessary headers and libraries are available. Can also be explicitly requested or disabled with -imf and -no-imf options. Change-Id: I3f9780fc189a33e4c93fb4f950111121f8e947c3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add support for BB10 input method frameworkRoger Maclean2013-10-2511-920/+779
| | | | | | | | | | | | | | | | | | | | | | | | | Added input method support for the BB10 variant of Qt to the extent possible using standard Qt APIs. This adds support for text predictions and entry of languages such as Chinese. Change in interface to QQnxAbstractVirtualKeyboard was made because it is felt the new one is slightly nicer. It doesn't appear safe to assume the focus object has a particular property and in fact in my tests the code failed to work. In some cases the code uses variable and function naming at odds with normal Qt coding standards. This has been done for functions called and data provided by the BB10 input system as for those of us who need to maintain such things, it makes their meaning considerably clearer. While qqnxinputcontext_imf.cpp was used as an initial base for development one can consider the new version as largely new code. I don't believe the original version was ever complete and in any event would not compile. Change-Id: I09470801ffa237cee67da40c0b3d02ed5c77531e Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Introduce QTextDocument::baseUrlJ-P Nurmi2013-10-254-24/+115
| | | | | | | | | Required for QQuickText & friends to implement image resource handling in a clean way - to get rid of QQuickTextDocumentWithImageResources and eventually make QQuickTextEdit's document interchangeable. Change-Id: I97314a6c3e2d5726539d5722795a472631388cb0 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Clean up common winrt/winphone mkspecOliver Wolff2013-10-251-2/+1
| | | | | Change-Id: I010bf977e01fab2f39184bbe730ec70128cc2982 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmake: Support MSVC2013 for WinRT buildsAndrew Knight2013-10-259-25/+65
| | | | | | Change-Id: I1c102f0b029616997d72933a90c0f9a2a3a9e222 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* WinRT: Added msvc2013 mkspecsOliver Wolff2013-10-2512-2/+183
| | | | | | | Change-Id: I052f6ba19056e7c0df6d7ea5548eb4dac4db125e Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-10-24293-1662/+4373
|\ | | | | | | Change-Id: Ie56539b2e0be611a363b5f15ae5412a78d6945a2
| * Reserve some space for future use in QLoggingCategoryKai Koehne2013-10-242-1/+8
| | | | | | | | | | | | | | | | | | Currently Qt offers only debug, warning, critical message types for general use. Most logging frameworks offer more ... let's save some space for future message types. Change-Id: Icb4333da5c8f5277fd10d8a01b06d95369662bdc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Remove doc references to non-existing functions in QSurfaceFormatSean Harmer2013-10-241-2/+2
| | | | | | | | | | | | Change-Id: I5a9de5b719e111e47a1ea7334609695f1db6149a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * BlackBerry: improve BPS event lifetime managementJonathan Hoffmann2013-10-232-4/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QEventDispatcherBlackberry::select(), if an event handler called through filterEvent() starts a nested event loop by creating a new QEventLoop, we will recursively enter the select() method again. However, each time bps_get_event() is called, it destroys the last event it handed out before returning the next event. We don't want it to destroy the event that triggered the nested event loop, since there may still be more handlers that need to get that event, once the nested event loop is done and control returns to the outer event loop. So we move an event to a holding channel, which takes ownership of the event. Putting the event on our own channel allows us to manage when it is destroyed, keeping it alive until we know we are done with it. Each recursive call of this function needs to have it's own holding channel, since a channel is a queue, not a stack. However, a recursive call into the select() method happens very rarely compared to the many times this method is called. We don't want to create a holding channel for each time this method is called, only when it is called recursively. Thus we have the instance variable d->holding_channel to use in the common case. We keep track of recursive calls with d->loop_level. If we are in a recursive call, then we create a new holding channel for this run. Change-Id: Ib3584676d2db5a9a3754a1535d5fb6c9e14f5dbb Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
| * Rename BlackBerry arm mkspecs to be aligned with NDK structureWolfgang Bremer2013-10-238-29/+123
| | | | | | | | | | | | | | | | | | | | | | The current NDK uses CPUVARDIR variable to define whether x86 or armle-v7 is used. Therefore, the whole structure uses these two definitions to separate simulator and device builds. Renaming blackberry-armv7le-qcc to blackberry-armle-v7-qcc allows to directly use CPUVARDIR during Qt5 builds. For compatibility reasons the old folder is kept and includes the new qmake.conf. Change-Id: Ia7feeeabe16eda48140a65178af28cbb9bd085a9 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| * Windows: Handle WM_SYSCOLORCHANGE as theme change.Friedemann Kleint2013-10-231-0/+3
| | | | | | | | | | | | | | Task-number: QTBUG-34170 Change-Id: I6ca11ab67c1e2752300fc167fb8f3c4f0d9ae2b8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * Fix crash in QXcbDrag.Friedemann Kleint2013-10-231-1/+1
| | | | | | | | | | | | | | | | | | handleStatus() was called with drag==0 when releasing the mouse over the desktop. Task-number: QTBUG-33920 Change-Id: I553647d1e734934b7c6caf4c984683cff88f9162 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| * Fix typo in check for MINGW_W64 versionKai Koehne2013-10-231-1/+1
| | | | | | | | | | | | | | | | Got introduced in 9b187bcd6a256b53cc2fb85500 Change-Id: I1d713f8309d3d8568ea836cc1d29f9dca685ac01 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| * Doc: Added a link to the Qt Quick Test pageVenu2013-10-231-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-33316 Change-Id: Ib8c479837cac4b7cca47b979cbb2dad0aaae6412 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
| * QFileDialog can delete files too, not just directoriesShawn Rutledge2013-10-232-0/+22
| | | | | | | | | | | | | | | | | | After Ic12de12ec51c20de52d040514e90be5e783add43 this functionality was broken. Added an autotest. Task-number: QTBUG-34159 Change-Id: I8f41b7073dc57fea855ab87796f09e8a91520d13 Reviewed-by: David Faure <david.faure@kdab.com>
| * Don't crash if the platform plugin is not initializedBogDan Vatra2013-10-231-0/+3
| | | | | | | | | | Change-Id: I999411816192edbd2bf40c6bda92d6e94fb3d1b0 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * de-duplicate QT_MODULESOswald Buddenhagen2013-10-231-0/+1
| | | | | | | | | | Change-Id: I8f1bf08070abb1ba05a4fdb14e7de9e7da5b3ec7 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * return()-related break() insanity is not necessary in qt5Oswald Buddenhagen2013-10-231-1/+1
| | | | | | | | | | Change-Id: I593c7160e44d51d25dee76c56c2e5580345ab42a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * don't suggest to use qtAddModule(), it's internal APIOswald Buddenhagen2013-10-231-1/+1
| | | | | | | | | | | | Change-Id: Idf01d0dd74a0708014b7fca33611535c604a75f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 23:40:10 +0000