summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | iOS: ensure that we restore text selection with correct cursor and anchor posRichard Moe Gustavsen2015-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt keeps track of the selection direction since a selection anchor can be placed both to the left or to the right of the cursor. On iOS, the selection should instead always be specified from left to right (using a position together with a positive length). So when restoring the selection after performing the calculation of the text rect, we need to ensure that we follow this format. Change-Id: Id8bea6c35e2781e1431ee963f601b6e9ef05dbf5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | iOS: support cut/copy/paste shortcuts when using Bluetooth keyboardRichard Moe Gustavsen2015-08-111-8/+42
| | | | | | | | | | | | | | | Change-Id: Iaa602771227f64c3a477a27656362a361f78e8dd Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | QMimeDatabase: Run more tests on non-XDG/shared-mime-info platformsEike Ziller2015-08-116-25/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows and OS X, where QStandardPaths does not use XDG_DATA_DIRS/ _HOME and shared-mime-info is not installed, the tests that require additional shared mime info xml files were never run. Mend that by using QStandardPaths' test mode instead of setting XDG_DATA_HOME. Change-Id: I53b75c293c41c4dac63986dcb88972c2b54d5428 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: David Faure <david.faure@kdab.com>
* | | QComboBox: make editable comboboxes usable with input methodsRichard Moe Gustavsen2015-08-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QComboBox uses a QLineEdit for text editing. But while editing, the combobox is the widget having focus, not the line edit. Instead the combobox forwards all the IM events to the line edit internally. This causes a problem since the line edit will not be able to update the platforms IM state in QWidget::updateMicroFocus() since it doesn't have focus. The result will be that the platforms IM state will get out of sync with the QLineEdit. This patch will add the missing connections that lets QComboBox update the platforms IM state when the inner QLineEdit signals that its needed. Change-Id: Ic3e0fdbf155d4dbeab31e2cd859f6e425ae87375 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | QLineEdit: update IM status after selection changeRichard Moe Gustavsen2015-08-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As it stood, we only told the platform about a selection change if the cursor also changed position. But if you have a selection, and press key left, the selection will be cleared without moving the cursor. And for those cases, we didn't report the selection change back to the platform. The result was that the IM status in the platform plugin got out of sync with the widget. This patch will add the missing connection that updates the platform whenever the selection changes. Change-Id: Iab0848f27207b63ed4fb47f0d4f24a6d02e87db1 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | Use /Zc:throwingNew by default with MSVC 2015Thiago Macieira2015-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | As recommended by MS in http://blogs.msdn.com/b/vcblog/archive/2015/08/06/new-in-vs-2015-zc-throwingnew.aspx Change-Id: Id3d5c7bf4d4c45069621ffff13f80cecc1141353 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | When the focus changes make sure that the IME finishes correctlyAndy Shaw2015-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When clicking onto another widget while in the middle of composing should cause it to be seen as an acceptance of the composed text so far instead of just cancelling it outright. This was validated against the Japanese, Korean and Chinese IMEs on Windows 7. Task-number: QTBUG-42344 Change-Id: I03be0cd099840f51a9550929f33e2afbbf31e85a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | Fix out-of-buffer read on image upscaleAllan Sandfeld Jensen2015-08-101-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid reading from the next pixel when the sample is fully based on the current pixel. This is particular important for the last pixel in an image when the next pixel might be outside the image buffer. Change-Id: I3607f9c6c332d11ff944ca35d216d417368f9fd5 Task-number: QTBUG-47228 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Extend QNetworkReply test exclusion on OS XSimon Hausmann2015-08-101-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test is very flakey in 5.5 integrations and the OS X CI machines have notorious problems with networking stability. So the previously listed tests are not really at fault, it's an infrastructure problem, that we choose to ignore for the time being. Change-Id: I7fbfa7b3778daa6b5e60d95b822847c92927122f Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Always return grayscale indexed8 from QImage::alphaChannel()Allan Sandfeld Jensen2015-08-091-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We shouldn't short-cut alpha8 formats in alphaChannel, the method is used under the assumption that the returned alpha map has encoded the alphas as an indexed grayscale image. The method is also documented as not returning alpha8. Task-number: QTBUG-47138 Change-Id: I1cf16957d12e65d44f2b586d9f127fcb33c549b6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | Improve readability of QTextLine's handling of (negative) right bearingTor Arne Vestbø2015-08-071-26/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Helper functions in LineBreakHelper have been renamed from adjustFoo to calculateFoo, to signal that they do work, and are not adjusting something relative to something else. - The use of QFixed(1) and >= 0 has been replaced with an explicit constant for the case of the bearing not being calculated yet. - A helper function negativeRightBearing() has been added that returns the absolute value of any negative right bearing, making the width computations simpler. - Comments have been added and rewritten to make the logic clearer. Change-Id: I1d3a0214cfa8b4fed4551f3444b43a37d55bd69b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
* | | WinRT: Fix Visual Studio 2015 project generationMaurice Kalinowski2015-08-072-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - ApplicationTypeRevision has been updated to 10.0 in the final VS2015 release - For Universal App project one needs to specify WindowsTargetPlatformVersion and WindowsTargetPlatformMinVersion - Disable adding Qt libraries to the DeploymentFiles variable for Universal Apps. Before an error occurred during build as windeployqt asked to package the very same files. However, windeployqt also takes care of plugins and hence we prefer to rely on windeployqt and disable the link step parsing. Change-Id: I5180519cabde60dbc7786ef27a6fbe0ef2ac44f3 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | WinRT: Link against correct c-runtimeMaurice Kalinowski2015-08-074-30/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to move adding ucrt(d).lib out of the various qmake.conf as qmake.conf is only parsed once by qmake and does not differentiate between debug and release. Hence use default_pre.prf which is the earliest prf to use. This one also is being parsed multiple times and does what it is supposed to do. This allows API certification tests for Win10 to suceed, another sideeffect is that it is much cleaner at a single location now. Change-Id: Id899f4bbd063a3191c8f139857abf90efa827ffc Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | Make tst_accessibility's characterRect match ↵Tor Arne Vestbø2015-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | QAccessibleTextWidget::characterRect The former didn't account for ascent and descent. Change-Id: If741f22f7e79ac3c13e58f2966358010d9f9ec81 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* | | Fix link to QQ articleAndy Shaw2015-08-071-1/+1
| | | | | | | | | | | | | | | Change-Id: I04d373778b243fdeb281c98e292359996639c95e Reviewed-by: Richard J. Moore <rich@kde.org>
* | | QTreeView: add size hint handling information to uniformRowHeightsSamuel Gaist2015-08-061-0/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-10802 Change-Id: I6aa60d8fd7678f02003a229e191a5ab4f93c4b9d Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* | | Doc: mark private QChar constructors as internalSamuel Gaist2015-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-39862 Change-Id: Ie0d533e3897200589248c803069c41661b15997e Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Doc: add documentation for QMAKE_HOSTSamuel Gaist2015-08-062-0/+26
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-13745 Change-Id: Ieeecb0f2bb065fe2ec5a1112a25a7b83bf701bd1 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Doc: add clarification about signals not being buffered when blockedSamuel Gaist2015-08-061-0/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15238 Change-Id: Id762007415245f104ffe5cdfd100889f9a73ae95 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | Doc: Fix wrong reference QApplication::setStandardPaletteSamuel Gaist2015-08-061-1/+2
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-46078 Change-Id: Ifb1c650467a0fc30a0d11ad58708a64e5f9fabd5 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* | | QProcessEnvironment documentation typo fixSamuel Gaist2015-08-061-6/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-45985 Change-Id: I42de961ca6d57847c135abd8395494d0e416ab05 Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | | Add reference to QRegularExpressionSamuel Gaist2015-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there's no mention of QRegularExpression in QRegExp's documentation. This makes it hard to find QRegularExpression for user used to QRegExp. This patch adds that missing reference. Task-number: QTBUG-46816 Change-Id: If3a981d5759fbed3eecd07e046882e6da378cc4e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Sze Howe Koh <szehowe.koh@gmail.com>
* | | Add env variable to control bearer backend polling timers.Lorn Potter2015-08-061-4/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scanning and updating networks can cause transmission jitters when scanning every 10 seconds. setting QT_BEARER_POLL_TIMEOUT, in milliseconds will set polling timer for those bearer backends that require polling, such as generic and windows. Task-number: QTBUG-46015 Change-Id: I0338cd34ad78488ebef250a0114d17ce190434e8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | | WinRT: Fix build for Windows 10Maurice Kalinowski2015-08-061-10/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SDK Version has been updated, hence include and lib directories were wrong. Luckily, Microsoft introduced an environment variable in the final VS2015 release to identify the location. Also has the benefit to reduce hardcoded paths. Change-Id: I9726db031d87d119bc7326154b24554c4b685d57 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com> Reviewed-by: Mika Lindqvist <postmaster@raasu.org>
* | | QMacStyle: Disable progress bar animationsMorten Johan Sørvig2015-08-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Disable progress bar animations on 10.10 Yosemite and higher - the native style does not animate them any more. Keep the indeterminate progress bar animation. Change-Id: If15fa0321e184101ef19b1050eb5e9d8f27480d8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
* | | Fix crash when mixing widgets with QtQuick 1 and Qt Quick 2Simon Hausmann2015-08-062-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Apply the fix from commit 313a74cc4a9a5d200b2059d3d8767fe1a274c50d also to the QWidget and the QGraphicsObject destructor. Task-number: QTCREATORBUG-10273 Change-Id: I47983b49cc4d9b75a2e1ee838e13403bc4b95a59 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | | WinRT: Add Architecture flag to manifestMaurice Kalinowski2015-08-061-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The architecture needs to be specified to be properly used inside Visual Studio and for winrtrunner to parse dependencies. Change-Id: I218100f33efcba9f78199cbd1e48089269648e61 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | WinRT: Fix build for Windows 10Maurice Kalinowski2015-08-063-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bf24838c3344f009f9fe40f596a4eab798f071b3 introduced a hard dependency on kernel32.lib, which needs to be added for the msvc2015 mkspecs. As the library differs for Windows Phone / Windows 10 Mobile, this most likely has the side-effect that we will need to introduce winphone-xxx- msvc2015 at a later stage. Change-Id: I8fa2a68d421345c14ba90efc6faa5eea1ad457e1 Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | WinRT: Add dependency support for Win10Maurice Kalinowski2015-08-064-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So far the dependency keyword has been ignored for the new Windows 10 mkspecs. The difference to older manifest files is that there is already a <Dependency> section and hence we embed dependencies inside this one, as the format standard does not allow to have multiple of those. Change-Id: I1bf25979cc28d5c153215de5bb9cd6f37e9c50aa Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* | | WinRT: Add manifest and assets to install rulesMaurice Kalinowski2015-08-061-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | This enables to create fully functional packages from the output of 'nmake install'. Change-Id: Ief83532cdfc4575f7c42f5bb6a3cee4c9f0ecbd3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | | Don't add qmutex_xxx.cpp to SOURCES, as qmutex.cpp #include's themThiago Macieira2015-08-061-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally qmake catches the #include and drops the source from SOURCES. But the parser has bugs, so help it by never adding the files. The false: SOURCES += is left so that the sources can be found by Qt Creator. Task-number: QTBUG-46582 Change-Id: I049a653beeb5454c9539ffff13e667877350346b Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | Don't check if Pentium's CPUID leaf 1 existsThiago Macieira2015-08-061-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It does. When CPUID was introduced in late 486, it already supported leaf 1. That means all Pentium-class systems (including Intel's new Quark systems) have CPUID and they have at least leaf 1. Change-Id: Ib306f8f647014b399b87ffff13f1d5d2530d9ddd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Doc: update QDebug documentation to talk about the escapingThiago Macieira2015-08-061-8/+95
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-47316 Change-Id: Ib306f8f647014b399b87ffff13f303badb2a7a63 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* | | Change how QDebug escapes QStrings in the outputThiago Macieira2015-08-065-22/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Important Behavior Changes] QDebug output for QStrings changed compared to Qt 5.5.0 to more closely match the output of previous Qt versions. Like Qt 5.5.0, QDebug will escape non-printable characters, the backslash and quote characters, but will no longer escape the printable characters. Task-number: QTBUG-47316 Change-Id: I52dd43c12685407bb9a6ffff13f62ef68cbc80c5 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | FreeBSD has pipe2, so enable it in forkfd.cThiago Macieira2015-08-061-0/+4
| | | | | | | | | | | | | | | Change-Id: Ib056b47dde3341ef9a52ffff13efd1a15748e44d Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* | | Fix warnings about unused variablesThiago Macieira2015-08-061-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Found by ICC qglengineshadermanager.cpp(427): warning #177: variable "none" was declared but never referenced Change-Id: Id3d5c7bf4d4c45069621ffff13f758ffaf1744d7 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | Seed the random number generator before using QTemporaryDirThiago Macieira2015-08-062-1/+14
| | | | | | | | | | | | | | | | | | | | | Otherwise, on some systems (Windows), we'll always create the same dirs. Change-Id: Id3d5c7bf4d4c45069621ffff13f79ba91e0f974b Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
* | | Fix shortcut handling with modifiersFrederik Gladhorn2015-08-054-4/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since d7ca800a87a2291c94c6580f0cfe068bb2280caf the shortcut events were only sent once. The one sent by QGuiApplication did not create a QKeyEvent with the full native modifier state - basically the extended key event expected everywhere. That means that shortcuts on some keyboard layouts - like ctrl-shift-7 on the German keyboard (resulting in ctrl+/) - would not work when the shortcut override was tested from QGuiApplication, but then the same shortcut was sent from QApplication with the full information, so it worked the second time. Shortcuts of this type in Qt Quick were broken before. Task-number: QTBUG-47062 Change-Id: I8390b9a96d0d998a2a538ac65503702e0d299cc7 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
* | | Allow sharing contexts in QOpenGLTexture::destroy()Laszlo Agocs2015-08-041-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | Checking for the exact same context is too strict. The texture is valid in sharing contexts too. Task-number: QTBUG-47521 Change-Id: Ifdf329ef5361b48abcb7c69e08acd7e35d624a08 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | | Android: Manually detach the thread after calling quitApp.Christian Strømme2015-08-031-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | On Android 5.0 ART will complain when we don't detach the thread before the application is about to quit (non-fatal). This is because we re-attach to call quitApp and then leave it attached. Change-Id: I4571ef5f38d92afcaf91cb920ebe121a7be7835a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | QLoggingCategory: fix default severity in Q_LOGGING_CATEGORY macroAlex Merry2015-08-032-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][QtCore][QLoggingCategory] Fixed behavior of default severity passed to constructor or Q_LOGGING_CATEGORY with regards to QtInfoMsg, which was previously treated as being more severe than QtFatalMsg. This is because the code was using the numeric value of QtMsgType as a proxy for severity (via the <= operator), but the value of QtInfoMsg is greater than QtFatalMsg. Instead, the severity ordering must be dealt with explicitly. Change-Id: I5f178afc735221b00cb67c2cea4fa964bd9079ce Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* | | fix build with no built-in image handlersOswald Buddenhagen2015-08-036-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the handlers' .pri files added $$PWD to INCLUDEPATH to make the files self-contained when used externally, but this polluted the include path of the gui module itself, thus hiding incorrect use of QPA includes. Task-number: QTBUG-47400 Change-Id: I576469a71e8ded0b409d62687999c0fa884613f9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | do not warn about "untested" Windows versionsJoerg Bornemann2015-08-031-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the qWarning that was printed when running a Qt application on desktop Windows versions that Qt doesn't know about. This warning isn't helpful, it's only visible for command line applications and it can only be turned off by rebuilding the application with a newer Qt version. Removing the warning is also consistent with all other platforms - even non-Desktop Windows. Change-Id: If1cac92ce99974335319d0b9a74f1006069abd7a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | | QSslSocket: Update error string in setSocketDescriptor()Kai Koehne2015-08-031-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I03cd3886c0e2dbb07ef8d37e75df36308ee5fea5 Reviewed-by: Alex Trotsenko <alex1973tr@gmail.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* | | Disable #pragma diagnostic [push|pop] for gcc 4.5Kai Koehne2015-08-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix warnings like qalgorithms.h:40:16: warning: expected [error|warning|ignored] after `#pragma GCC diagnostic` As the comment below also indicates, #pragma GCC diagnostic [push|pop] is only supported from gcc 4.6 upwards. See also the GCC 4.6 changelog: https://gcc.gnu.org/gcc-4.6/changes.html [ChangeLog][Compiler specific Changes] GCC: Fixed a regression introduced Qt 5.5.0 that generated lots of compiler warnings in Qt public headers when using the (deprecated) version 4.5 of GCC. Change-Id: I425388b61cd5fbf464a0f7dd46ce403d35c532a4 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | MSVC2015: Disable warning C4577 ('noexcept' used with no exception handling ↵Friedemann Kleint2015-08-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mode specified). Fix the flood of warnings: src/corelib/global/qflags.h(52): warning C4577: 'noexcept' used with no exception handling mode specified; termination on exception is not guaranteed. Specify /EHsc now occurring since we don't have exception handling enabled. Change-Id: I05d12ee6303b4f9fceb48507fadfd7d1a5604ea4 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* | | Don't expose qt_setQtEnableTestFont(bool) by defaultKonstantin Ritt2015-07-314-39/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | Build it only in -developer-build mode for tests that might depend on exact-matching font behavior. Return earlier to avoid doing any useless job. Change-Id: I966ee5689f03403e45f4c957b63e3113f0467803 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
* | | [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>