summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [QBasicFontDatabase] Minor code clean-upKonstantin Ritt2015-07-312-7/+3
| | | | | | | We do not use supportedWritingSystems anymore -> simply remove. Change-Id: I8c8b4b0614bf396c943d810c396d18e2d0201eff Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Micro optimization to Basic/Android FDB::populateFontDatabase()Konstantin Ritt2015-07-312-16/+20
| | | | | | | | | Re-use QDir to check if dir exists (QDir::exists() also returns false if path specifies a file), and use somewhat faster QDir::entryInfoList() to iterate the font files. Change-Id: Iea3a6e5548928a01db71037425adf170cb722151 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Default implementation for QPlatformFontDatabase::fallbacksForFamily()Konstantin Ritt2015-07-318-48/+60
| | | | | | | | | ...mainly for platforms that do not provide a native/unified way to obtain system-defined font fallbacks list (ie !CoreText && !FontConfig). Change-Id: I23c5589d79ddecb6311ccc52ec8b29977f06d408 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* [QFontDatabase] Defer the fallback families list initializationKonstantin Ritt2015-07-312-20/+22
| | | | | | | | | | Use the same trick the WebKit related path has used for years: if there is no explicit list that takes a precedence over the default one (i.e. QFont("Arial,SimHei")), then defer the fallback families list initialization until it gets requested. Change-Id: If5a74294bdebb24865c619bc0d7328b3e706de76 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* ssl: add support for EC keys to non-OpenSSL backendsJeremy Lainé2015-07-313-1/+70
| | | | | | | | Adds basic support for QSslKey reading / writing Elliptic Curve keys on backends other than OpenSSL (i.e. WinRT / SecureTransport for now). Change-Id: I67012dbe6b844a3ed5b22b63e0cdbacf0497a74a Reviewed-by: Richard J. Moore <rich@kde.org>
* Revert "Fix performance of recursive read-write locks"Thiago Macieira2015-07-312-0/+58
| | | | | | | | | | | | | | This reverts commit 666486b3efec871301b82244ec661e1eaa6cca9c, which removed the QHash that protected against reader recursion deadlocks. Without this hash, a reader will block on d->readerWait.wait() until the writer finishes its task. However, the writer never starts because there's a reader that hasn't released the lock. That's a deadlock. Change-Id: I792373bb361db35eb9e5504229c099008821a665 Task-number: QTBUG-47530 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* qdoc: Fix incorrect keyword details written to .qhp for QML propertiesTopi Reinio2015-07-311-7/+1
| | | | | | | | | QDoc tried to refer to an non-existing node (a parent of a parent) of a QML property when writing the unique ID of a QML property keyword. Change-Id: I90ab92b6ac95cfa688ca79a2c4d6c72f0e30d018 Task-number: QTCREATORBUG-3708 Reviewed-by: Martin Smith <martin.smith@digia.com>
* qdoc: Fix string used in compatibility members pageTopi Reinio2015-07-311-1/+1
| | | | | | | | Add a missing space in the comment generated at the top of the compatibility members page. Change-Id: I21e010f9fca41346bb50c4b400325b18ff672738 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Add a \target for license information within QImage documentationTopi Reinio2015-07-311-2/+3
| | | | | | | | | | | This allows us to link to it from the Qt licensing information page. Also, replace the \legalese command with \badcode in order to keep the license text formatting intact. Task-number: QTBUG-46478 Change-Id: I1b5100ca0373a533bd56852ab2a8f18e72404334 Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>
* qdoc: Add images used in examples into .qhpTopi Reinio2015-07-311-1/+3
| | | | | | | | | Images used as resources in examples were missing from the generated .qch files. Change-Id: I7cdfc65b646a418e3de0b22d9a075e9a413aca29 Task-number: QTBUG-46635 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Fix SNI for TlsV1_0OrLater, TlsV1_1OrLater and TlsV1_2OrLaterAndré Klitzing2015-07-301-6/+3
| | | | | | | | | | Since SslV3, SslV2 and UnknownProtocol do not support it we can invert the IF clause here. Change-Id: I42e942337d01f3a8c97885b268bffa568e40d335 Task-number: QTBUG-47528 Reviewed-by: Mikkel Krautz <mikkel@krautz.dk> Reviewed-by: Richard J. Moore <rich@kde.org>
* ssl: add test certificates with DSA and EC keysJeremy Lainé2015-07-3012-5/+103
| | | | | | | | The QSslCertificate tests only covered certificates with RSA keys, this extends the test coverage to DSA and EC keys. Change-Id: Ibee26f449cf6c1d97cbac6b511972eb44d6f0bd2 Reviewed-by: Richard J. Moore <rich@kde.org>
* xcb: Make it compile on systems with xinput2 < 2.2Martin Koller2015-07-301-11/+13
| | | | | Change-Id: I7e98d3540cd7717ac8af8d1993618d18320f811a Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* QLineEdit should inherit the input methods from QComboBox.BogDan Vatra2015-07-302-0/+10
| | | | | | Task-number: QTBUG-39088 Change-Id: I4dfe9a052c20a4cb0a9d6b0d3337cb5095a3694f Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Android: Start the application when we know the screen geometry.BogDan Vatra2015-07-302-13/+25
| | | | | | | | | Until now we'se set the screenGemetry to 0,0 until the layout is created, but some controls needs it before that. Task-number: QTBUG-44271 Change-Id: I7d00e2a142572e27fc77e46566bb2cdb37f58035 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Doc: QFileDialog::ShowDirsOnly not supported on WindowsLeena Miettinen2015-07-301-5/+10
| | | | | | | | | The native Windows file dialog does not support displaying files in the directory chooser. Task-number: QTBUG-46982 Change-Id: Ib58f3d888df564d42044b81ad8e67b8aeae5f3c6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* consistently handle empty program string in QProcess::start overloadsJoerg Bornemann2015-07-302-1/+49
| | | | | | | | | | | | | | | | | | | | All overloads of QProcess::start will now check whether the program string is empty and in that case - set error to FailedToStart, - set errorString to "No program defined", - emit error. Until now only one of the three overloads behaved like this. As a side effect, start(QString(), QStringList()) will not crash on Windows anymore. Task-number: QTBUG-47404 Change-Id: I2f93657204fe3643b1d74a74817843c05fc4a96b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* Fix typo in test results report for androidSamuel Gaist2015-07-281-1/+1
| | | | | Change-Id: Ibb2319b1e96ce34d4c61c8504b7700a78462c56c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* Fix typo in filterAcceptsColumn docs: row is used in place of columnSamuel Gaist2015-07-281-1/+1
| | | | | Change-Id: Ic0ec62e4d5c4a4b1d71f14c5d3133657341d4fe3 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Let the linker find xcb_poll_for_queued_event for usThiago Macieira2015-07-281-6/+9
| | | | | | | | It's more efficient than we are. This also enables the code to work in the unlikely case of an ELF platform without RTLD_DEFAULT. Change-Id: Ib306f8f647014b399b87ffff13f12f8aeeb2589a Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* Make the function pointer to xcb_poll_for_queued_event not a memberThiago Macieira2015-07-282-16/+20
| | | | | | | | | | | | In the normal case, this change is a no-op. In case RTLD_DEFAULT isn't defined, this makes the job of the optimizer easier to detect that the static variable is never modified and that it can do a lot of dead code elimination. This also enables the optimization in the next commit. Change-Id: Ib306f8f647014b399b87ffff13f12f40a359233b Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* xcb: Fix build with QT_NO_CURSORAndrew Knight2015-07-281-0/+2
| | | | | Change-Id: I2391c2921274b7a178fbdde1d0f59f7fbaa3048e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* forkfd: Fix build with uClibc <= 0.9.33Thiago Macieira2015-07-281-2/+4
| | | | | | | | | | | | | | That version of uClibc has neither pipe2 nor eventfd. There were two problems with our detection. First, it checked for glibc incorrectly, so the comparison was always true as __GLIBC__ << 16 = 0x20000 Second, we needed to check for uClibc's version. Task-number: QTBUG-47337 Change-Id: Ib306f8f647014b399b87ffff13f3023b7f8d6d4a Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* ssl: fix comment typo in QSslSocket testsJeremy Lainé2015-07-281-1/+1
| | | | | | | | The comment about non-OpenSSL backends not reproting a specific error for self-signed certificates contained a typo, this fixes it. Change-Id: I3010981d5d87d68ebf5e984c003b8bbbfb019b96 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* ssl: fix QNAM self-signed certificate test for non-OpenSSL backendsJeremy Lainé2015-07-281-2/+10
| | | | | | | | | Non-OpenSSL backends are not able to report a specific error code for self-signed certificates. Change-Id: I56bf130335b2afa65cf2bd5248a40ac0e32f74c2 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Doc: uiplugin in the qmake variable referenceLeena Miettinen2015-07-281-0/+4
| | | | | | Task-number: QTBUG-47180 Change-Id: Ia563445e36b0abb0ef7707e7a0e4241d70e60cfd Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
* xcb: fix tablet proximity againShawn Rutledge2015-07-281-5/+4
| | | | | | | | | Patch 53d289ec4c0f512a3475da4bbf1f940cd6838ace caused it not to select property change events, which are needed separately for each tablet device. It's not enough to select them on the master device. Change-Id: Ibb6c7990d2edd865019eacfa7eed4bf818f7557e Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* iOS: ensure we don't overwrite a projects qmake variablesRichard Moe Gustavsen2015-07-281-13/+13
| | | | | | | | | | | | | | | | Consider a project that does the following: launch_images.files = $$PWD/LaunchImage.xib QMAKE_BUNDLE_DATA += launch_images In that case we end up overwriting launch_images.files in default_post, and at the same time, add launch_images a second time to QMAKE_BUNDLE_DATA. The result will be that we copy our own launch image twize into the bundle. To prevent this, prepend our internal variables with qmake_ Change-Id: I24f870874017b5388248e3bfadecd461422ffe35 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Fix the internal compositing flag for QOpenGL/QuickWidgetLaszlo Agocs2015-07-281-2/+2
| | | | | | | | Compositing stays active for the window even when all such widgets get destroyed. Task-number: QTBUG-46937 Change-Id: Ib4acc90689151fd7de234806c4b5c0c472c13a5c Reviewed-by: Jørgen Lind <jorgen.lind@theqtcompany.com>
* ssl: fix native parsing of certificates with DSA keysJeremy Lainé2015-07-281-1/+1
| | | | | | | | Fixes a typo which breaks the parsing of certificates with DSA public keys when using a non-OpenSSL backend (WinRT, SecureTransport). Change-Id: I250ba9948d5bd7739e281d7cd1b95cfbcb10e402 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Windows: Split code paths for touch/native gesture events.Friedemann Kleint2015-07-273-6/+27
| | | | | | | | | | | Fix up 2b5df245d6cdbfb3150ee815debccf655af8f19f which routed WM_GESTURE through QWindowsMouseHandler::translateTouchEvent() causing asserts on missing touch devices. Task-number: QTBUG-47184 Change-Id: Ie843ebb343e34487bcac9c9dbea88de641d51e28 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Clear qt_tablet_target only when all buttons are released.Friedemann Kleint2015-07-271-1/+1
| | | | | | Task-number: QTBUG-46694 Change-Id: Ie95a452dfffd6685dd2a32068872dc18f727c288 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* iOS: add missing Q_DECL_OVERRIDERichard Moe Gustavsen2015-07-277-45/+45
| | | | | | | Add missing Q_DECL_OVERRIDE to silence clang. Change-Id: I57261a39f0dcf4e0ffd8d9c079a95f2d3347d34a Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* iOS: use UIKeyboardTypeNumbersAndPunctuation for Qt::ImhPreferNumbersRichard Moe Gustavsen2015-07-271-0/+2
| | | | | | | | | | | | Using Qt::ImhPreferNumbers means that we should use a keyboard that has focus on typing numbers. But it's important that we don't restrict typing to numbers only, it also needs to support normal text input. And this seems to be exactly what UIKeyboardTypeNumbersAndPunctuation does. Task-number: QTBUG-47365 Change-Id: I5bb88cedcbe0e89ea884dc9c14d3ffd9fb368060 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* Fix compilation error while instantiating operator<< explicitlyOlivier Goffart2015-07-262-3/+20
| | | | | | Task-number: QTBUG-47375 Change-Id: Ibd260de88c174c1aa3833a56b153b8b74d337338 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* ios: Do not drop the user-provided default QSurfaceFormatLaszlo Agocs2015-07-251-1/+1
| | | | | | | Task-number: QTBUG-47195 Change-Id: I40bc7be816f5e23a63a2fe6d32842143b52f9d58 Reviewed-by: jian liang <jianliang79@gmail.com> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@theqtcompany.com>
* Doc: Don't advertise QLocale::system() in QTranslator::load documentationKai Koehne2015-07-231-1/+1
| | | | | | | | | | Usually you want to use just QLocale(), and not QLocale::system(). They are both the same except when the user called QLocale::setDefault() beforehand. Change-Id: I2d9b13ac3ffec0005b1d9bf661eccdea276d34b1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* Windows/QClipboard: Fix crash in debug output of QMimeData.Friedemann Kleint2015-07-232-19/+20
| | | | | | | | | | Rewrite QDebug operator<<(QDebug d, const QMimeData &mimeData) to take a pointer and handle 0 values. Change the formatting to the style commonly used in Qt. Make it static as it is not used anywhere else. Task-number: QTBUG-47393 Change-Id: I78174e10b75769bf4acd33a894acc0a51e525c39 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Fix action shortcuts for QToolButtonPaul Olav Tvete2015-07-232-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverting change 4db5d3ccd17d448b59db491e2f261892f31fec74, since it introduced two separate regressions: 1. QToolButton would prefer text() over iconText() 2. Actions with a mnemonic would create a shortcut when added to a tool button. There is a fundamental problem here, which is impossible to solve correctly: A menu item with the text "Short&cut" will create a mnemonic, i.e. it will be triggered by pressing 'c' when the menu is open. However, a button with the text "Short&cut" will create a shortcut that is triggered by Alt+C as long as the window has focus. Also, iconText() is used for tool tips, so it should not contain shortcut related '&'s. This patch attempts to find a sensible compromise: 1. If the text is set through QAction::setText(), QToolButton will not create a shortcut, and will not display an underline. 2. Using QAction::setIconText("Short&cut") will create the shortcut. 3. Tooltips will not show any extra '&'s when generated from text(), but when using setIconText() directly, any '&' characters used to create shortcuts will also be visible in the tooltip. Task-number: QTBUG-23396 Task-number: QTBUG-47306 Change-Id: Ieea2fc569807c862ca462349bf91922a4029700f Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com>
* Doc: Amended the \inmodule statement for QSessionManagerVenugopal Shivashankar2015-07-231-1/+1
| | | | | | | | | The sources for QSessionManager live under Qt Gui so it doesn't make sense to include the class under the Qt Widgets doc module. Task-number: QTBUG-47274 Change-Id: I18b58c2a274bff323c7364cebbb0429a5a3a97d6 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* fix -no-opengl buildJoerg Bornemann2015-07-232-1/+4
| | | | | Change-Id: Id3570cf10d86908ddff35be65103d16b353dad04 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* QPdfEnginePrivate - fix for '-qreal float' build.Timur Pocheptsov2015-07-221-4/+4
| | | | | | | | | | Literals 1. or 0. have type double, but QGradientStop.first is qreal and thus can be float depending on platform/configuration, making qBound call invalid (qBound(0., qreal_value, 1.) for example). Change-Id: Idab668d417a148bffe2495009ae700de980b73cc Task-number: QTBUG-47319 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* Fixed null pointer dereferenceRon Bessems2015-07-221-6/+6
| | | | | | | | | Crash in qtwidgets.dll when Qt app is used with accessibility tools like Dragon. Crash due to null pointer dereference. Task-number: QTBUG-47093 Change-Id: I140196ba44b68dfaf229dd8a8e6031379ea1acac Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Doc: Add Q_MV_IOS to ignored C++ directivesNico Vertriest2015-07-221-1/+2
| | | | | | | | | | | | | | Enumeration QSysInfo::MacVersion uses a macro to define enumeration values. QDoc gets confused about it and prints a lot of warnings. Adding the macro to ignored directives does not resolve the documentation issue completely (enum values still show up as '?'), but it gets rid of the warnings. Task-number: QTBUG-43810 Change-Id: Ie4009646a78c62b5f1860d29855d3941e79d9388 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc:added doc to undocumented functionsNico Vertriest2015-07-2227-36/+375
| | | | | | Task-number: QTBUG-36985 Change-Id: Ic358682b276d67ef804f727bcf14191718613469 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Replace old C-style castAndré Klitzing2015-07-221-2/+2
| | | | | | | User gets compiler warnings for plugins if "-Wold-style-cast" is enabled Change-Id: I142ae2676ca7690c8e8e10c73a4007e85d8f448d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* xcb: Ignore disabling of outputs in the middle of the mode switchAlexander Volkov2015-07-221-5/+13
| | | | | | | | | | | | | | X server may send RROutputChangeNotify event with null crtc and mode, when it switches an output mode. Request RROutputInfo to distinguish this case from the case when the output is explicitly disabled. Change-Id: I4c2356ec71dbcc8013009ea8a6f46dd11f19d6bb Task-number: QTBUG-44158 Task-number: QTBUG-46786 Task-number: QTBUG-46822 Reviewed-by: Daniel Vrátil <dvratil@redhat.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* When a screen comes back online, the windows need to be told about itRalf Jung2015-07-221-0/+8
| | | | | | | | | | | | | | | | On my system, this fixes the misbehavior of Qt applications when the (only) active screen is switched, e.g. from an external screen to the laptop. This behavior is caused by the screen() of widgets to be set to NULL when their screen goes away. When a new screen comes online, the widgets *should* be told about it, but they are not. The only place that "maybeSetScreen" is called is when an existing screen changes its geometry, but not when a screen gets enabled without its geometry being affected in any way (e.g. because it was just disabled via xrandr, but has been connected all along). This makes sure that "maybeSetScreen" is also called when a screen gets enabled. Task-number: QTBUG-47041 Change-Id: Ic72d6beaa544bf9a4efdbea0830b1bc0d6ce5362 Reviewed-by: Dmitry Shachnev <mitya57@gmail.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* Add the GPLv3 license textThiago Macieira2015-07-222-1/+689
| | | | | | | LGPLv3 refers to it but does not include it in its body. Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* QTimeZone: Convert fractional timezones properly.Cesar Garcia Naranjo2015-07-212-6/+31
| | | | | | | | | [ChangeLog][QtCore][QTimeZone] Fixed a wrong timezone conversion when the POSIX timezone rule contains a fractional timezone (e.g. VET4:30). Task-number: QTBUG-47037 Change-Id: I5d9052929bbcde174614ccf07c329264603e6431 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-08 21:14:14 +0000