summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove remaining Q_DECL_NOEXCEPT/Q_DECL_NOTHROW usageAllan Sandfeld Jensen2019-04-0472-239/+239
| | | | | Change-Id: I91ac9e714a465cab226b211812aa46e8fe5ff2ab Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clang_cl: Use -O3 for full optimizationAllan Sandfeld Jensen2019-04-041-1/+2
| | | | | | | | Pass it through as a traditional clang argument instead of relying on what MSVC cl.exe can take. Change-Id: I94405ce6ab80d16b687e62c9aa4b2866ba84f0e2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Allow word break wrapping in Korean textEskil Abrahamsen Blomfeldt2019-04-044-3/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Korean text, they typically can use both the "Western" style of word wrapping, i.e. breaking on spaces, as well as the East-Asian style of potentially breaking between all syllables. However, the Unicode Line Breaking Algorithm, TR14 defaults to breaks on syllables and specifies a possible tailoring where Hangul is mapped to the AL class instead: "When Korean uses SPACE for line breaking, the classes in rule LB26, as well as characters of class ID, are often tailored to AL" When using Qt, the user would expect the WordWrap wrap mode to break between words in Korean. If you want the syllable-based text layout, you would use WrapAnywhere, probably accompanied by line justification. To avoid breaking QTextBoundaryFinder and other potential clients of QUnicodeTools which depend on getting the precise Unicode data from the algorithm, we do this by passing a flag from QTextEngine when initializing the attributes. This way, it can also be made optional later on, if we decide there is a reason to add an additional wrap mode specifically to handle cases like this. [ChangeLog][Important Behavioral Change] WrapWord now correctly prefers line breaks between words in Korean text. WrapAnywhere can still be used to get breaks between syllables instead. Done-with: Alexey Turitsyn <alexey.turitsyn@lge.com> Task-number: QTBUG-47644 Change-Id: I37b45cea2995db7fc2b61e3a0cc681bbdc334678 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Add QMetaProperty::relativePropertyIndex()Simon Hausmann2019-04-042-0/+13
| | | | | | | | | | | | | Add a "sibling" function for QMetaProperty::propertyIndex() for the relative index. That way in QtQml we can avoid using propertyIndex() - metaObject.propertyOffset() where the latter traverses the parent chain. Change-Id: I113a956801b0e8d56a30a847b5b919da703824e2 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QCommandLineParser: warn if defining a duplicate optionDavid Faure2019-04-042-1/+13
| | | | | | Fixes: QTBUG-74907 Change-Id: I3741a5241515dfaf4353458a9ef13ceaeb9fea0b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix font matching of typographic families on WindowsEskil Abrahamsen Blomfeldt2019-04-045-5/+34
| | | | | | | | | | | | | | | | | | | | | | | 9204b8c31ea1b5f0c05870c5b5d74c33b1a4f622 broke font matching on Windows. After this change, if you request a specific face of a family, such as "Arial Black", and Qt detects that its typographic/preferred name is "Arial", then it will be added as the single style of the Arial family, which will in turn be set as populated=true. So if you later request a regular font of "Arial" family, then it will see that the family has already been populated, skip this step, and then see that there is only one style available, i.e. "Arial Black". To work around this, we need to make sure the typographic family is properly populated the first time it is registered. [ChangeLog][Windows][Fonts] Fixed a bug where it would be impossible to request different faces of a font family after a specific type face has been in use. Task-number: QTBUG-74748 Change-Id: Ia0caace2b88a32e6114ff23ad10ee1ea8f5a3e03 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* Remove commented test in testlib (alive)Jędrzej Nowacki2019-03-296-244/+0
| | | | | | | The test was added as commented in 2012, before it was not even mentioned in the pro file. I guess it was never run. Change-Id: Ib787c7811ab4f7f32a99869167cde2e12dbe3156
* Cleanup widgets/kernel.pro after modularizationJędrzej Nowacki2019-03-261-2/+0
| | | | | | QSound test lives in QtMultimedia. Change-Id: Id47b5744b9494c77eb2c2c0d1fe2f807d2dd2083
* Ensure that layouts don't move widgets outside of their parentVolker Hilsheimer2019-03-262-0/+75
| | | | | | | | | | | | | | | | When using a style that wants to draw into the layout's margin (like macOS style does with group box titles), parts of the widgets would be clipped by the parent if the available margin is smaller than necessary. This moves the x/y coordinates to at least 0/0, and adjusts width and height accordingly. [ChangeLog][QtWidgets][QLayout] Prevent clipping of group box titles on macOS (and similar styles that draw into layout margins) Change-Id: I32148a92858c13fb2325da4d0a2a58996e0e8930 Fixes: QTBUG-67608 Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* core: Add deduction guides for QPairMikhail Svetkin2019-03-253-0/+34
| | | | | | | | | [ChangeLog][QtCore] Added support of deduction guides for QPair Change-Id: I41a798390dc2c925b0f8432ba12aa345724de2d7 Reviewed-by: Martin Smith <martin.smith@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
* Clean up QTextStream functionsAllan Sandfeld Jensen2019-03-233-71/+145
| | | | | | | | | They are the only Qt symbols neither prefixed with q or with the Qt namespace. This changes preserves source and binary compatibility while making it possible to define conflicting symbols. Change-Id: I6d4181206e63faa922fa0c8b644e0a4b88826a97 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Stabilize tst_QStateMachine::dontProcessSlotsWhenMachineIsNotRunningMilian Wolff2019-03-221-4/+4
| | | | | | | | | | | | | | | | | The test is flaky which was uncovered by the upcoming QTimer::singleShot optimization patches: When the Emitter's thread is started and executes the timout functor before the state machine is started, then the state machine will never see the emitSignalWithNoArg signal and thus never transition to the final state and finish. This patch ensures that the code in the background thread is only run after the state machine was started to fix this flakyness. Change-Id: I6f91a2420165662ece75e550a6d73fe098137d4c Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* qstringalgorithms: add find methodsAnton Kudryavtsev2019-03-224-204/+208
| | | | | | | | | Also add qsizetype support. It's needed to add find methods to QStringView Change-Id: I45eac082924e27778c24eebbb19d694221c28978 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Widen out parameter "result" of the native event filters for Qt 6Friedemann Kleint2019-03-2228-0/+147
| | | | | | | | | LRESULT on Windows 64 is a 64bit type, adapt filter functions of QAbstractNativeEventFilter and QAbstractEventDispatcher accordingly. Fixes: QTBUG-72968 Change-Id: Ie53193e355f0b8e9bd59fa377f43e2b4664a2ded Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update handling of TESTSERVER_COMPOSE_FILEMaurice Kalinowski2019-03-221-4/+6
| | | | | | | | | | | | | | | Initially TESTSERVER_COMPOSE_FILE could be manually specified. Later this got removed by accident. Re-enable this feature. Furthermore, check if a module has a platform-specific compose file. If not, fall back to a default docker-compose.yml. This is useful to include testserver.pri from other modules, where no platform-specific requirements are present, ie the image from provisioning works on all platforms. Change-Id: Icb92552fd61196be332b2431ab0f8a43b9157fc8 Reviewed-by: Ryan Chu <ryan.chu@qt.io> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* Clang: use -Oz instead of -O1 to optimize for sizeYuhang Zhao2019-03-214-2/+6
| | | | | Change-Id: I60fecba64e968d10b87a9c1af571ff4a3aa98ad7 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clang: Enable precompiled header for qmakeYuhang Zhao2019-03-211-2/+0
| | | | | | | | Tested with Clang 8.0.0, everything works fine. Task-number: QTBUG-74563 Change-Id: I3e216b062352851a7be59543ef1a4029f919111d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't iterate over the connections without holding a lockLars Knoll2019-03-212-1/+18
| | | | | | | | | | | | | When checking whether a slot is connected to a signal, we need to hold the signalSlotLock to be sure about the answer, or we can get crashes when a connection gets removed while doing the check. The check in activate() can handle some uncertainty as it's only a shortcut to the longer path. Fixes: QTBUG-74604 Change-Id: I3fc822455fbadc0223ef68632f5fb3df3ff3e86d Reviewed-by: Aapo Keskimolo <aapo.keskimolo@qt.io>
* QVector: Add assignment from std::initializer_listKari Oikarinen2019-03-213-1/+64
| | | | | | | | Change-Id: I88a66e4b78ca6f40c328070f275e7163fb0d691c Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* QVariant: Fix isNull() == true after downcasting QObject*Timo Lang2019-03-212-0/+10
| | | | | | | | | | [ChangeLog][QtCore][QVariant] Fixed a bug that caused isNull() to be true after downcasting a QObject* payload using convert(). Fixes: QTBUG-73196 Change-Id: Ifda15952f873d7142c95609b69ac424bbf16b723 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* clang-cl: Enable linker optimization explicitlyYuhang Zhao2019-03-211-0/+2
| | | | | | | | In release mode, MSVC linker will enable it by default while clang-cl won't. So enable it explicitly. Change-Id: Iabfd8698d426290fee59662acf6c124b9f226c11 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clang: Add Thin LTO in addition to Full LTOYuhang Zhao2019-03-204-3/+13
| | | | | Change-Id: I6502f3ff31c16faebd9b931b99b77a273971f611 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* rcc: Avoid raw string literalshjk2019-03-201-23/+12
| | | | | | | | Subjective, but for me its easier to follow code flow if indentation is not interrupted. Change-Id: If811ba1b975189c94a671627be8eb3a1fd67aeb9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Make tst_QTemporaryFile::fileTemplate() more informative on failureEdward Welbourne2019-03-191-1/+1
| | | | | | | | | | A QCOMPARE(..., true) isn't much use; and failure would have set the object's .errorString(), which seems like it'd be worth reporting, so use QVERIFY2() instead. Change-Id: I2f3f9379984694891de81d2ffebc696d91eec70f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Add qFpClassify() to mirror std::fpclassify()Edward Welbourne2019-03-196-12/+84
| | | | | | | | | | | | The rules of std don't permit us to add an overload for fpclassify(qfloat16), so we need our own equivalent that we *can* overload. Deploy it in the few places we use fpclassify(). Extended qnumeric's testing to cover qFpClassify(). Change-Id: Ie5a0a5cc24599d1571404c573d33c682b0d305a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Refine and extend tst_qnumeric's checks on infinity and NaNEdward Welbourne2019-03-191-7/+24
| | | | | | | | | Renamed the test, since it covers both, verified slightly more and added checks that QCOMPARE() copes as intended. Fixed some minor coding-style defects in the process. Change-Id: I49c2ffa0568a29e9e4b7f7395d4cacdeb0401da0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Clean up and document the generator for qurltld_p.hEdward Welbourne2019-03-191-67/+96
| | | | | | | | | This scans the public suffix list and emits suitable content for the header. Made some modest efficiency gains while hopefully making the code easier to understand. Check for success when opening files. Change-Id: If6b25c5c85f86209b33d9188743e820690e7dc05 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-1633-118/+389
|\ | | | | | | Change-Id: Ief0a0b754c104d5348fee9ee15e967bd37c526f8
| * Fix some qdoc warningsFriedemann Kleint2019-03-157-7/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | src/network/ssl/qsslsocket.cpp:1501: (qdoc) warning: Can't link to 'QSslConfiguration::defaultCaCertificates()' src/network/ssl/qsslsocket.cpp:1482: (qdoc) warning: Can't link to 'QSslConfiguration::defaultCaCertificates()' src/network/ssl/qsslsocket.cpp:1513: (qdoc) warning: Can't link to 'QSslConfiguration::defaultCaCertificates()' src/network/ssl/qsslsocket.cpp:1119: (qdoc) warning: Can't link to 'QSslConfiguration::setDefaultCiphers()' src/network/ssl/qsslsocket.cpp:1119: (qdoc) warning: Can't link to 'QSslConfiguration::defaultCiphers()' src/gui/opengl/qopengltexture.cpp:4137: (qdoc) warning: Can't link to 'setComparisonFunction()' src/widgets/dialogs/qfilesystemmodel.cpp:1215: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text src/widgets/graphicsview/qgraphicswidget.cpp:1229: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text src/widgets/graphicsview/qgraphicsscene.cpp:3313: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text src/gui/painting/qpaintengine_raster.cpp:3438: (qdoc) warning: Undocumented return value (hint: use 'return' or 'returns' in the text src/widgets/widgets/qtextedit.cpp:2544: (qdoc) warning: Overrides a previous doc src/widgets/widgets/qplaintextedit.cpp:2932: (qdoc) warning: (The previous doc is here) Change-Id: I0c68c59a87eb6a5d9e974f857af6aca0c6e0672d Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Fix qdoc errors in QProcess headerFriedemann Kleint2019-03-151-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | Split apart the #ifdef so that qdoc on non-Windows systems sees Q_SECURITY_ATTRIBUTES and Q_STARTUPINFO, fixing: LOG Build & visit PCH for QtCore src/corelib/io/qprocess.h:204:9: error: unknown type name 'Q_SECURITY_ATTRIBUTES' src/corelib/io/qprocess.h:205:9: error: unknown type name 'Q_SECURITY_ATTRIBUTES' src/corelib/io/qprocess.h:210:9: error: unknown type name 'Q_STARTUPINFO' Change-Id: I50b4ee6113da4cd49b6b08b84e6e6590438c5573 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Fix qdoc errors in QIcon headerFriedemann Kleint2019-03-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | Add missing forward declaration, fixing: src/gui/image/qicon.h:93:16: error: unknown type name 'QPainter' This apparently only happens for qdoc. Change-Id: I39e78258f16628d477b629778241c4f5031820c4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Don't increase the size of the layout unnecessarily when moving toolbarsAndy Shaw2019-03-153-1/+120
| | | | | | | | | | | | | | | | | | When the toolbar was moved from one position to another it could end up increasing the size of the saveState data due to extra lines. This removes any needless ones that should not be included. Change-Id: I1c5d094ae1405d6a82db5fcdc3cd081904706837 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * wasm: fix touchpoint handlingLorn Potter2019-03-152-23/+49
| | | | | | | | | | | | | | | | | | | | | | | | emscripten sends a touchstart event for every touch point when a new touch point happens, so this makes them moved or stationary if already known. This allows QtQuick PinchArea to work. Task-number: QTBUG-72214 Change-Id: I8e7c0cd2d78b07cfeae21491846cc31092359050 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-1518-78/+190
| |\ | | | | | | | | | Change-Id: I2bf3b4ceb79364330eae4cbf3cdee9a82d1be46d
| | * Fix compilation of qCDebug("", ...) with QT_NO_DEBUG_OUTPUTKai Koehne2019-03-142-16/+34
| | | | | | | | | | | | | | | | | | | | | | | | ... and fix QT_NO_INFO_OUTPUT, QT_NO_WARNING_OUTPUT alongside. Fixes: QTBUG-74359 Change-Id: I2167dc943ae8c52602e08e24ca815d95f82a5db8 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | * QAbstractItemView: Don't let editor width exceed item width if not neededChristian Ehrlicher2019-03-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The editor geometry was adjusted in RTL but not in LTR mode before Qt5.11. 3ed91da4997cf793742e5bba2adb3dbec9ecd458 fixed this but now all editors are shown with their default size instead adjusting to the item width. This works in most cases but fails for small column widths and e.g. a QDoubleSpinBox. Therefore adjust the size policy for the editors so their default size is ignored and therefore the column width is used. Don't do this for a QDateTimeEdit since this makes no sense to only show a cut of part of the editor. Fixes: QTBUG-74327 Change-Id: Ie526155571bf24a2d8f38e988d8b2af4bfcc92ba Reviewed-by: Samuel Gaist <samuel.gaist@idiap.ch> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| | * uic: write out min/maximumSectionSize property before current sizeChristian Ehrlicher2019-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since faff43348bfae5cfc709fabe9d2698fc3063c050 the min/maxSectionSize is respected when setting the current/default section size programatically. This is not honored when writing out the properties and therefore the default section size is not correctly set when it's smaller then the default minimum section size. Therefore make sure to set min/maxSectionSize property before all other properties. Fixes: QTBUG-74352 Change-Id: I8f9ede3e90b7c9c65f8440953b00e1d9d6006d38 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
| | * androiddeployqt: Also shellquote rootPath as part of importPathsUlf Hermann2019-03-141-1/+1
| | | | | | | | | | | | | | | | | | Fixes: QTBUG-74212 Change-Id: Ie0c9b5b230e93e50d6e636a6105c3bd717715374 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
| | * Windows QPA: only calculate invisible margins when window has a frameChristian Andersen2019-03-142-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit ec97be5585 an invisible frame calculation was added for Windows 10 that fixes QWidget::move(0,0) for main windows and dialogs. But because e.g. Qt::ToolTip windows do not have a window frame, the invisible margin calculation causes them to pop-up in the wrong position (off by a few pixels). [ChangeLog][Windows] Fixed QToolTip pop-ups and QComboBox animation pop-ups being off by a few pixels on Windows 10. Fixes: QTBUG-74062 Change-Id: I218e8409a250a8b81ecd1d409b597ebd01fb255f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Windows QPA: Output all adapters in diagnostics used by qtdiagFriedemann Kleint2019-03-144-41/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split up the code detecting the GPUs into small helpers. Add a QDirect3D9Handle class providing Direct3D9 functionality, add GpuDescription::detectAll() and add a QVariantList "gpuList" property to the native interface. Task-number: QTBUG-50371 Task-number: QTBUG-65882 Change-Id: I8673542d327837babc2ad8f507da76e8ff5524ea Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| | * XCB: Fix clipboard breaking when timer wraps after 50 daysLukáš Turek2019-03-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | xcb_timestamp_t is a 32-bit unsigned value in miliseconds, so it wraps after 49.7 days. When it happens, QXcbConnection::m_time stops updating and copy & paste in an application would not work until the application is restarted. This patch detects the timer wrap and allows m_time to wrap too. The fix was verified in KDE desktop with applications running for 51 days. Fixes: QTBUG-65145 Change-Id: I328c4179c1b1f71914adda6f9a0ca3991a7e808e Reviewed-by: Uli Schlachter <psychon@znc.in> Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
| | * Configure: simplify logicYuhang Zhao2019-03-141-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replace hard-coded win32-msvc20XX mkspec names with a variable substitution expression. Change-Id: I4911cb3e169cd7603453d7c8a67a2a291d15c796 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Configure: add missing "clang.exe"Yuhang Zhao2019-03-141-1/+1
| | | | | | | | | | | | | | | | | | | | | This amends commit 16b7afc. Change-Id: I6c0e4b476035e4733e828724109b950d5b3a8dd6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * QNX QPA: Add support for Qt Virtual KeyboardKarim Pinter2019-03-142-7/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the QT_IM_MODULE environment variable is set, then it loads the IM module accordingly, otherwise it is using the PPS one, if it is available. Task-number: QTBUG-54576 Change-Id: Icb8b474805053d8297029096365783c2cabc2cbc Reviewed-by: Samuli Piippo <samuli.piippo@qt.io> Reviewed-by: James McDonnell <jmcdonnell@blackberry.com> (cherry picked from commit 8a7c373f8e745427d5fe7afc08d698837b7b8f2b) Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Doc: "UTF" -> "UTF-8"Thiago Macieira2019-03-141-1/+1
| | | | | | | | | | | | | | | Change-Id: Ifbadc62ac2d04a9a8952fffd158a5a9ba87c30e0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| | * Add a pair of functions to convert to and from Q/CborErrorThiago Macieira2019-03-141-4/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We've so far made our public API match the TinyCBOR error codes, so the conversion is trivial. Having the two functions allows us to change that, if it becomes necessary. It also effectively concentrates the Coverity warning about mixed enums in a single pair of functions. >>> CID 190307: Incorrect expression (MIXED_ENUMS) >>> Mixing enum types "CborError" and "QCborError::Code" for "err". Change-Id: Ifbadc62ac2d04a9a8952fffd1589e739c7a5b745 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| | * Doc: Use nullptr in Signals & SlotsKai Koehne2019-03-132-3/+3
| | | | | | | | | | | | | | | Change-Id: I9b377e00ce177ae33972479bde11dd03061224d7 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * QOpenGLContext: fix docs about sharingGiuseppe D'Angelo2019-03-131-1/+1
| | | | | | | | | | | | | | | | | | | | | FBOs cannot be shared. Streamline the remainder of the sentence. Change-Id: I654b23f86f4ee4ea2ca8e71958464d9f55394297 Reviewed-by: Martin Smith <martin.smith@qt.io>
| | * Fix win32-clang-g++ buildYuhang Zhao2019-03-131-1/+3
| | | | | | | | | | | | | | | | | | Change-Id: Ide803de12736d545807a4ae650ff8f8bce5dccd8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
| | * Doc: fix some typos and missing doc for QScopeGuardEirik Aavitsland2019-03-111-0/+6
| | | | | | | | | | | | | | | Change-Id: Ifd492387abbffa551e08a6bcc01e248b8402254d Reviewed-by: Martin Smith <martin.smith@qt.io>