summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove tests from BLACKLIST for macOSMorten Johan Sørvig2018-03-081-29/+0
| | | | | | | | | | Whitelist tests that pass locally and that have been blacklisted since the BLACKLIST was introduced in 2015 (in commit a8dda3b8). Change-Id: I777b490313ebaa6c8c8daee168487d350179a5e6 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Make QDir::tempPath() canonicalTor Arne Vestbø2018-03-072-3/+3
| | | | | | | | | | | | | | | | | | | To have a stable base for creating temporary files it's useful to have the temporary path be not just cleaned, but also the canonical path, so that any symlinks are resolved. This is e.g. the case on macOS, where /tmp is symlinked to /private/tmp. Fixes tests that compare paths, e.g: FAIL! : tst_QDir::current(startup) Compared values are not the same Actual (newCurrent.absolutePath()): "/private/var/folders/51/hhvngbjd36vbn1ncklb73g2h0000gn/T/tst_qdir-FACBOE" Expected (currentDir) : "/var/folders/51/hhvngbjd36vbn1ncklb73g2h0000gn/T/tst_qdir-FACBOE" [ChangeLog][QtCore] QDir::tempPath() now reports the canonical path of the temporary directory, with any symlinks removed. Change-Id: I20df9076c9869227f32740b196fd7ffb8b1b9ced Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use simple scaling for downscaling less than 2xAllan Sandfeld Jensen2018-03-075-199/+214
| | | | | | | | | | | | | | The simple scaling that only samples every input pixel once, can be used with downscaling < 2x as well if we just handle the case where the input can't be in the intermediate buffer. At the same time the handling of the intermediate buffer has been moved out of simple scale helper functions so the code can be shared and the AVX2 optimizations also used for non-argb32pm formats. Change-Id: I98d225ef8d4f2978480d09110c959b556c563b57 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* tst_qstorageinfo: Don't add extra newlines when printing volumesTor Arne Vestbø2018-03-071-1/+1
| | | | | | | The printVolumes function already adds line endings. Change-Id: Id2553f881ccc0ab3c8b8fc77d3096dd5d968abda Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* tst_qsettings: Check case sensitivity of actual settings fileTor Arne Vestbø2018-03-071-1/+1
| | | | | | | | Instead of the current working directory, which doesn't necessarily match the location of the settings file. Change-Id: Idffe2e87190cc9b6027fbba3b84e9dbf72ccf2f6 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qtmain_winrt: Remove unused leftovers from Windows (Phone) 8.1 timesOliver Wolff2018-03-071-15/+2
| | | | | | | | | | | On Windows (Phone) 8.1 __getmainargs was still supported and used to do the initialization of the application's parameters and environment. When that functionality was removed together with the now unsupported OSs,the initial filling of argc, argv, and env part was forgotten. Change-Id: I3b788de317b22b4525427faefc3fe974dac5d9ac Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* winrt: Add null pointer to the end of the arguments arrayDavid Schulz2018-03-071-1/+3
| | | | | | | | | | | Although WinRT doesn't officially support argc/argv, respect C++03 §3.6.1/2 (The value of argv[argc] shall be 0). Task-number: QTCREATORBUG-19705 Change-Id: I190e2923b8a0665cc8975a800619fd916a4dd244 Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Miguel Costa <miguel.costa@qt.io> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
* QUndoStack: add more Q_PROPERTYsMitch Curtis2018-03-071-0/+5
| | | | | | | | | | | | | | | | This is the first step in being able to use the undo framework in QML. The next step would be to separate it out of Qt Widgets so that a pure Qt Quick application doesn't need to rely on it. Note that QUndoCommand is not a QObject, so we cannot expose its text member as a property until Qt 6. [ChangeLog][QUndoStack] Exposed canUndo, canRedo, undoText, redoText and clean as Q_PROPERTYs. Task-number: QTBUG-40040 Change-Id: Ida7ec03f871f0db7fdcc5b90ed200024c5cb348e Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* eglfs/kms: Share atomic request with nativeRes.ForIntegrationLionel CHAZALLON2018-03-071-0/+4
| | | | | | | | | | This allows to share the atomic request so that applications can blend content into overlays within the same renderloop. atomic request will allow several planes update in the same commit. Change-Id: I762ea96499765ced573e287dbd52d53c64ec7c74 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Qt Forward Merge Bot2018-03-0716-38/+72
|\ | | | | | | refs/staging/dev
| * Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-0716-38/+72
| |\ | | | | | | | | | Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
| | * Check for WindowActivation capability instead of platformJohan Klokkhammer Helsing2018-03-063-13/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before running tests that depend on QWindow::requestActivate Gets rid of several Wayland platform checks in tst_QWindow. Change-Id: I7a5e029044a968dfcf87ecbb5105c01d52852d35 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
| | * Make platform checks for Wayland more readableJohan Klokkhammer Helsing2018-03-061-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | And make it easier to fix if platformName == wayland-egl etc. Change-Id: Ia2d62ba003796e08f3e8a5bbfd0c3fd9d185e4e0 Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * Skip failing tests in tst_QWindow on WaylandJohan Klokkhammer Helsing2018-03-061-0/+6
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-66824 Change-Id: I33b826c2a373b264cc9b66444c52070eac1cdd5c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * cocoa: add qCDebug in QNSview::scrollWheelShawn Rutledge2018-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If you enable both qt.qpa.input.touch and qt.qpa.cocoa.mouse you can see the order and interleaving of the touch and scroll events. Task-number: QBUG-66329 Change-Id: I8e1a63e2958b85f7964bb597e49cf8529cb3f32e Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| | * uic: Add the include for QIcon conditionallyJarek Kobus2018-03-067-7/+14
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-66753 Change-Id: I31bd821396b59c8e83e19e02634cf1440a271215 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| | * Android: add option `-mstackrealign` to clang-x86 mkspecVyacheslav Koscheev2018-03-061-1/+1
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-66770 Change-Id: I5e8ced0fa60c67d7908f21e5c486fea0d7a50004 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| | * Doc: Update example Embedded DialogsNico Vertriest2018-03-051-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | Changed old signal/slot syntax to new version Task-number: QTBUG-60635 Change-Id: I7cbe8851d321b7632a08c098b69a96cc346d5f83 Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
| | * Add WFD_DEVICE_CLIENT_TYPE attribute for INTEGRITY S820Am ADPKimmo Ollila2018-03-052-6/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed to be compatible with latest Qualcomm BSP releases. This patch also makes it possible to select HW layer via QT_OPENWFD_CLIENT_ID and QT_OPENWFD_PIPELINE_ID environment variables. Change-Id: Ie795b21afc61a1de7c1d0b52cdb30a754e3f8266 Reviewed-by: Janne Koskinen <janne.p.koskinen@qt.io> Reviewed-by: Timo Aarnipuro <timo.aarnipuro@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> (cherry picked from commit 00f693d3e5046999270c92731e34a3e7fcd01c6b) Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| | * Document QFont::PreferNoShaping as being since 5.10Sergio Martins2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | "since format" copied from QEvent's documentation. Change-Id: Ib11609cd11f9cb9906d947f46c2cd61c7abd853a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | | implement non-member operator+ for iteratorsEric Lemanissier2018-03-0610-0/+23
|/ / | | | | | | | | | | | | | | | | all of these iterator classes already have a member operator+, which allows iter+int. This commits addes non-member operator+, which allows int+iter, and forwards to the member QList and QArrayData iterators now satisfy RandomAccessIterator concept Change-Id: I25c1dd8cea299e735d5a5e288dbe23dc1d7a1933 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | qlineedit: Use QIcon::Active for pressed action buttonKai Uwe Broulik2018-03-061-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt should be using its own API in the way it's meant to be. If there's an issue with Qt's built-in styles it has to be fixed there. Otherwise this causes problems with styles, such as KDE's Breeze, which make use of both Selected and Active states for icons. However, Qt's built-in styles do not have hover effects for tool bar buttons and menu items, so there's somewhat of a conflict here which was probably the reason for the workaround used. Change-Id: Ieaed580f548caf181b1005b4e82e3f2adc1f9ce5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | testlib: Remove Q_CC_BOR usesKari Oikarinen2018-03-061-8/+0
| | | | | | | | | | | | | | Borland's compiler is no longer supported. Change-Id: I61e3fa2cfbb244b9ca4d1db734992abb96f64709 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Add support for advanced blend equations to our OpenGL QPainterAllan Sandfeld Jensen2018-03-057-150/+175
| | | | | | | | | | | | | | | | | | Mesa and NVidia have been supporting these extensions several years now. It also means we can get rid of the dead unused code we had for advanced compositions. Change-Id: I6a2fcda13490abd977eb4cc3d8b34f186d05ca25 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | QAbstractSpinBox: respond to QEvent::LocaleChangeSven Pauli2018-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | Add a branch for QEvent::LocaleChange to the QAbstractSpinBox::event() handler to call updateEdit(). This will update the edit in case the locale's number features changed (decimal separator etc.). Task-number: QTBUG-65315 Change-Id: I9015b3a5bbe8e7b80f7bafa13f0f431507bc4cf7 Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Turn on more warnings for Objective-C code on Apple platformsJake Petroules2018-03-051-9/+19
| | | | | | | | | | | | Change-Id: I7d5f211e2441415134c5905b159b41dc3b2b231b Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | macOS: Base window collection behavior on the correct window flagsTor Arne Vestbø2018-03-051-7/+11
| | | | | | | | | | | | | | | | | | When QCocoaWindow::setWindowFlags is called, the window()'s flags have not been updated, so re-computing the collection behavior based on those would not be correct. Change-Id: I5512da75104483eac7100880c164a9d08fd82984 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Don't keep window flags around, we can get them from the QWindowTor Arne Vestbø2018-03-053-43/+41
| | | | | | | | | | Change-Id: I629a58e699ad39ec429e1e275152434db4abc572 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | eglfs/kms: Add DRM/KMS atomic supportLionel CHAZALLON2018-03-054-15/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for DRM atomic to qtbase eglfs/KMS QPA when libdrm and device supports it. Compared To legacy DRM API, atomic API allows to update multiple planes in one vsync. This is the first part of some work that should follow and allow: - DRM framebuffer upscaling for embedded devices that have weaker GPUs - Sharing the drm atomic request if the KMSDevice so that applications in userland can blend content on overlay in the same vsync loop. One of the application for DRM atomic and Qt is typically videoplayer integration at high resolutions (UHD) on embedded devices which cannot use their GPU to render such videos, but are able to render it to a drm overlay. Change-Id: I047adf3e3d07a53440d52c2a7073c9ed054adf34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-0511-62/+105
|\| | | | | | | Change-Id: Ifce6ddeb4dab8c672732ec6aa6c19a6c4bce447e
| * Make tst_QWindow::generatedMouseMove pass on WaylandJohan Klokkhammer Helsing2018-03-051-1/+1
| | | | | | | | | | | | | | | | By using qWaitForWindowExposed instead of qWaitForWindowActivated. Task-number: QTBUG-66824 Change-Id: Idf604157070731d9c92ccf64d8349c8571960b7c Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Don't skip tst_QWindow::windowModality_QTBUG27039 on WaylandJohan Klokkhammer Helsing2018-03-051-3/+0
| | | | | | | | | | | | | | | | The test actually passes, so there's no need to skip it. Task-number: QTBUG-66824 Change-Id: Id091776ff7ca7637fdcf0e0ced833982b5788d92 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| * Fix docs of QTextDocument::find with regards to default case sensitivitySimon Hausmann2018-03-051-3/+3
| | | | | | | | | | | | | | | | | | | | The default value for a default constructed FindFlags QFlag is zero and FindCaseSensitively is 0x2. Therefore the default behavior for find() is case insensitive. Change-Id: Id3419c3562fc6170fdb281098a22dd8205603847 Task-number: QTBUG-62660 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Remove unused variableAndré Klitzing2018-03-051-1/+0
| | | | | | | | | | | | | | Found by spotbugs. Change-Id: I0aa81e45ced0a995adb5e4a45be925e5ef219a77 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Blacklist tst_QWindow::modalWindowEnterEventOnHide_QTBUG35109 on windows ciLiang Qi2018-03-051-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-66756 Change-Id: I5a00625b73085a9ac2471b03bcc21db4b9a98962 Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * Blacklist tst_QGraphicsView::itemsInRect_cosmeticAdjust on UbuntuKari Oikarinen2018-03-051-0/+3
| | | | | | | | | | | | | | | | | | Has been flaky in CI. Task-number: QTBUG-66815 Task-number: QTBUG-66216 Change-Id: I2c3eb42507eae618486aa402474b4b3f85ff310e Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * moc: Don't error our when parsing "using namespace __identifier(...)"Andy Shaw2018-03-052-0/+4
| | | | | | | | | | | | | | | | | | | | This follows on from a2322519929bd36a90422dccc0310b8230729197 which covered a similar instance of this. As with that change, we should not abort the compilation, just ignore it. Task-number: QTBUG-63772 Change-Id: Ide958080a90f43ed19edd8a320e7d45de1c96821 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| * QHeaderView: make use of LayoutChangeHint in _q_sectionsChanged()Christian Ehrlicher2018-03-043-22/+61
| | | | | | | | | | | | | | | | | | When _q_sectionsChanged() is called from e.g. QSortFilterProxyModel the LayoutChangeHint is set which can be used to avoid useless work in this function. Change-Id: I034db3fcc7a5f9ea7ebc0fa3ffd7429edb154eb7 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
| * QHeaderView: fix indentation in setModel() and clear()Christian Ehrlicher2018-03-031-37/+37
| | | | | | | | | | | | | | | | | | The indentation of large code blocks in setModel() and clear() are not correct. Needed for another change to avoid whitespace changeds in there. Change-Id: I620c8c5e83e98747f5c17469738722cf976fb467 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Thorbjørn Lund Martsum <tmartsum@gmail.com>
| * Avoid infinite recursive loopAndré Klitzing2018-03-031-1/+1
| | | | | | | | | | | | | | | | Looks like this should be "super." instead of "super_" Found by spotbugs. Change-Id: I83d096eee332361d62e783581bfa15017536081d Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Android: Don't kill app when SIM card or density changesEskil Abrahamsen Blomfeldt2018-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds subscription to additional config changes on Android to avoid the application automatically restarting when the SIM card is replaced or the logical density of the screen is changed (as a result of the user changing it in settings). These restarts are especially problematic when using Qt in a home screen application due to the way they are launched. [ChangeLog][Android] Avoid the system restarting application when user replaces SIM card or changes the logical density of the screen. Task-number: QTBUG-63735 Change-Id: Iba85fe6239b2d29b543b3c4e2f953efb9b54f713 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | QTextEngine: use const (and const APIs) moreAnton Kudryavtsev2018-03-051-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | To avoid needless detach()ing: - don't make copy of tabArray unconditionally. - use qAsConst to avoid detatch in for loop. - For CoW types, prefer const methods. Change-Id: I3273316bdd862fee4c66bad8291898a9ed913c60 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | QTableView: Fix drawing grid for spanned cellsChristian Ehrlicher2018-03-041-6/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTableView draws its gridlines at width/height of the cells. This means that there is no gridline at x=0 and/or y=0. This is fine when there is a header. But when the header is invisible, an additional line at 0 must be drawn to have a boundary to the neighbor widget. When a span is drawn, the clip rect has to be adjusted in this case because x/y=0 belongs to the cell (and therefore would be clipped out). Also fix the drawing of the grid lines in RTL mode and with ScrollPerPixel. Task-number: QTBUG-22972 Change-Id: I1829770e3d5bf65421b590f7bb7354cbf222e3fb Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Port QWaitCondition to QDeadlineTimerThiago Macieira2018-03-038-25/+60
| | | | | | | | | | | | | | | | | | | | Since pthread_cond_timedwait takes absolute time instead of relative time like most POSIX API, there's a small gain in performance here: we avoid an extra system call to get the current time. Task-number: QTBUG-64266 Change-Id: I25d85d86649448d5b2b3fffd1451138568091f50 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into devQt Forward Merge Bot2018-03-0214-142/+131
|\| | | | | | | Change-Id: I967eca8f34584fca3a1e5696978e70f620582a2a
| * QLocale: Update the system private on QLocale default constructor if neededAlbert Astals Cid2018-03-022-0/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When first starting an Android app we have invocation order issue, to load the platform plugin we create the default QLocale (needed by the resource locator code to see if :/qt/etc/qt.conf exists) so when the android platform plugin loads and creates its own QSystemLocale, the QLocale defaultLocalePrivate is already created and pointing to globalLocaleData which means that systemData won't be called and thus the code that triggers the call to QLocalePrivate::updateSystemPrivate won't be called when calling QLocale(). I thought of two ways of fixing this, one was calling QLocalePrivate::updateSystemPrivatea() from the QAndroidSystemLocale constructor, but giving the responsibility to not break things to the plugin seems a little fragile, so making the check on QLocale() seems better. Without this patch an Android app doing QApplication app(argc, argv); qDebug() << QLocale().name(); qDebug() << QLocale().name(); qDebug() << QLocale::system().name(); qDebug() << QLocale().name(); would print "" "" "ca_ES" "ca_ES" now it correctly prints "ca_ES" the four times. Task-number: QTBUG-41385 Change-Id: I2cf419f59aa008fa3aca11295fe7d42c40bcc32e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
| * Blacklist tst_QWindow::testInputEvents on WindowsKari Oikarinen2018-03-021-0/+2
| | | | | | | | | | | | | | | | | | | | Multiple recent failures on Windows 10. Task-number: QTBUG-66798 Task-number: QTBUG-66216 Change-Id: I9d23d0381dbe62eb5469863f14e1a05548ce7dfa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * QTestlib/selftests: Fix failures due to logging system outputFriedemann Kleint2018-03-021-0/+1
| | | | | | | | | | | | | | | | | | Silence debug output by setting QT_LOGGING_RULES to turn off all debug output. Task-number: QTQAINFRA-1631 Change-Id: I5c2366b4fe4bac341dcfd92f68b6da8071c5b089 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Android: Close the DataOutputStream when we are finished with itAndy Shaw2018-03-021-1/+7
| | | | | | | | | | | | Task-number: QTBUG-66769 Change-Id: I93c49baa0ccab4f853402d9be675af1c50b2e0c1 Reviewed-by: Christian Stromme <christian.stromme@qt.io>
| * qstringapisymmetry: Fix XML parsing failing on invalid encodingsFriedemann Kleint2018-03-021-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | Evaluating testlib's XML output in COIN would fail with: "XML syntax error on line 7520: invalid UTF-8" for the toLatin1() tests due to some Latin1/UTF8 mixup. Add a helper function to convert the data to plain ASCII. Task-number: QTQAINFRA-1797 Change-Id: I1c64878d4c2a67b8c2689905b5ffe6707b5963c1 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>