summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | Replace executedQuery when executing a new queryJesus Fernandez2019-01-302-1/+22
| | | | | | | | | | | | | | | | | | | | Only the first successful query was stored in the variable. When a new query is executed the function QSqlResult::setActive was not replacing the last executed query. Fixes: QTBUG-28883 Change-Id: Ib4938c42e6264f9edd0764b4a392da7988f68fc0 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | QPictureIO::read(): don't work on dangling pointerChristian Ehrlicher2019-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | QPictureIO::read() is using pictureFormat() when the format has to be guessed. pictureFormat() returns a QByteArray which was implicit casted into a char* and then pointed to uninitialized memory. Fix it by using a QByteArray instead a plain char*. Change-Id: If9ae286ed68134af597f0b0c779789e40f9efaed Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | png: initialize color_type to 0Albert Astals Cid2019-01-301-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes ==12==WARNING: MemorySanitizer: use-of-uninitialized-value #0 0x6b8179 in setup_qt /src/qtbase/src/gui/image/qpnghandler.cpp:247:9 on fuzzed file Change-Id: I772d536a0db91665dc16e94751ef507de1064376 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | Blacklist qtimer/basic_chrono on macos due to flakinessTony Sarajärvi2019-01-301-0/+2
| | | | | | | | | | | | Task-number: QTBUG-73168 Change-Id: I56b45b7f474bdad73f6cd8514b42475e6107b6be Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | Expand blacklisting of qthreadpool to cover linux distrosTony Sarajärvi2019-01-301-0/+1
| | | | | | | | | | | | Task-number: QTBUG-38594 Change-Id: I07dccf8ac6ab07e61ddf6090037ea344449724f8 Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
* | Fix building offscreen QPA with Qt XCBAllan Sandfeld Jensen2019-01-291-1/+1
| | | | | | | | | | | | | | Only builds without XCB or with system XCB Change-Id: I1161c5b78c92308ac63c2e2907b9a5d8477ab2f0 Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io>
* | Add a string to the Android manifest to fix a lint warningLars Schmertmann2019-01-291-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Unused resources ---------------- Unused resources make applications larger and slow down builds. Amends e3689949ba5b23decb0ea85741a3f4829696788e. The string was introduced there but not added to the manifest. Task-number: QTBUG-72895 Change-Id: Id07e02074feb15ace2c99e6ace51d8fe407877fa Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Wasm: remove debug output.Morten Johan Sørvig2019-01-291-1/+0
| | | | | | | | | | Change-Id: Ieb9c06203626854f9b7c561563c3261510230803 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Cocoa: Don’t cache accessibility roleMorten Johan Sørvig2019-01-291-6/+3
| | | | | | | | | | | | | | | | | | | | | | The object role may in some cases (e.g. when using Qt Quick Loaders) be changed after construction, and we don’t have RoleChanged events. Change-Id: Idb246c1c1206221cacd93c83cbd07a0e3d98cb0e Fixes: QTBUG-72967 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* | Fix unused parametersJesus Fernandez2019-01-291-0/+4
| | | | | | | | | | | | | | Change-Id: Iafad6313fcf74e42c11628ce9ee0f797abfcb6ca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix default font properties when using raw fonts for text layoutsEskil Abrahamsen Blomfeldt2019-01-291-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When a QRawFont is set explicitly on the layout, we would get certain font properties from the QTextCharFormat instead. But when the properties had not been set on the QTextCharFormat, we would get the default values which were always 0/false, not the actual default values used in QFont. Instead, we calculate a QFont query based on the format and use the properties from this. This will give us the correct default values in the cases where they are not overridden. Change-Id: I53e5103739164c3d9eafaf76fcb4e8bda57bd12a Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | testlib: Add BXPASS and BXFAILOliver Wolff2019-01-2916-33/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prioritize blacklisting over QEXPECT_FAIL so that a test that is blacklisted no longer fails if QEXPECT_FAIL returns true unexpectedly. To reflect this state properly, the two values of BXPASS and BXFAIL were added to testlib's output. [ChangeLog][Important Behavior Changes][QtTestLib] Blacklisting of tests will be taken into account for XPASS and XFAIL. A blacklisted test that causes an XPASS will no longer be a fail. Task-number: QTBUG-72928 Change-Id: Ia2232fdc714d405fa3fd9aea6c89eb2836bc5950 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Doc: Correct minor link issue in qwidget.cppNico Vertriest2019-01-291-2/+1
| | | | | | | | | | | | Change-Id: I3b69a18c65b75f3e0014a12284904af208ef058d Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* | Fixups for GL_CONTEXT_LOST in QOpenGLExtensionMatcherDavid Edmundson2019-01-291-2/+11
| | | | | | | | | | | | | | | | Fixes the rest of the places we use the pattern of emptying the OpenGL error stack to be able to handle GL_CONTEXT_LOST. Change-Id: Ic45024fc6df84d70d60c48831fa586f889af0c0b Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
* | macOS: Apply alpha channel to surface format even when non-defaultTor Arne Vestbø2019-01-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | Relying on QSurfaceFormat() to check whether or not we should set the alpha channel size makes it impossible to tweak other properties of the surface format without also having to set the alpha. There's no need to do such as broad comparison, we can check the alpha channel size for its default value instead. Change-Id: Iac31d37c9460eb3e7ec5ee15902f7e5addb48178 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | macOS: Don't check for stale SDK unless target needs to be remadeTor Arne Vestbø2019-01-291-10/+23
| | | | | | | | | | | | | | | | | | | | Also catches some more variants of SDK mismatch, such as Xcode not being installed at all, or the SDK missing. Change-Id: I184aaa571ef0ea722ca64c54f665462dabc17533 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Remove requirement to lock graphics buffer before getting total sizeTor Arne Vestbø2019-01-291-1/+0
| | | | | | | | | | | | | | | | | | | | QPlatformGraphicsBuffer::byteCount() shouldn't need locking unless bytesPerLine() is implemented in a way that requires it, in which case the assert should be in the subclass. Change-Id: I0fdb04c0a3ab042408d6d17b2759509853573d16 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | configure: Respect -continue in qtConfParseCommandLineJoerg Bornemann2019-01-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | If configure is called with -continue, it should not stop processing command line arguments after encountering an invalid one. Example: configure ... -continue -quack -no-feature-gui would ignore everything after -quack. Change-Id: Ia5f0cb13414c9c0c7246ff0c72f8e935fe6dca3c Fixes: QTBUG-72912 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Consume the -skip option in qtbase/configureJoerg Bornemann2019-01-291-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | ...and yield a warning that -skip has no effect in a qtbase build. This is consistent with configure's help output and enables us to always pass "-skip qtwhatnot", whether we're calling top-level or qtbase configure. Change-Id: Ie5b0791a6000d1d78b1367658ad86a92b2ec6a6a Fixes: QTBUG-71253 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Kai Koehne <kai.koehne@qt.io>
* | QtOpenGL: Unify license headersKai Koehne2019-01-294-59/+92
| | | | | | | | | | Change-Id: Ia25b8f9833bd3d941ef73dcc7c6590063fe65329 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | QtConcurrent: Unify license headersKai Koehne2019-01-2920-20/+20
| | | | | | | | | | Change-Id: I9492ca18805c9663d48820424557595b8bc7eaa0 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | QtGui: Unify license headersKai Koehne2019-01-2932-197/+274
| | | | | | | | | | Change-Id: I0a2553b95b099fdfa83d42e71bdf9a192a6588c7 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* | Windows/Direct2d QPA: Use nullptrFriedemann Kleint2019-01-2833-283/+289
| | | | | | | | | | Change-Id: I6ce01caa58de78e0eb61e243ee1e7b05cc1f5568 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Windows QPA: handle pointer messages received during a drag and dropAndre de la Rocha2019-01-281-15/+0
| | | | | | | | | | | | | | | | | | | | | | It seems the pointer message handler was skipping the handling of touch and pen messages during a drag and drop operation, preventing the generation of events that quick was expecting and triggering a crash inside MouseArea. Fixes: QTBUG-73120 Change-Id: I2921e38dd7e44846607e6c614d7393cfa5664c69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Wasm: disable resources_bigMorten Johan Sørvig2019-01-281-1/+1
| | | | | | | | | | | | | | | | Errors out with “No data signature found”. Change-Id: Ia9a38e8c71aef4e090494ed4754f4c14e913b092 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Reviewed-by: hjk <hjk@qt.io>
* | Android: If there is no surrounding text then don't try to delete itAndy Shaw2019-01-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | If there is no surrounding text then we can save time by not sending an event to delete it as there is nothing to be deleted. This prevents the underlying widget from being confused as to where the cursor and anchor is later on when entering in new text. Fixes: QTBUG-65584 Change-Id: Ic6325c119327048dffd2baa68520871fb56370d5 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Don't enable the input method for the QListView in a QInputDialogAndy Shaw2019-01-281-3/+14
| | | | | | | | | | | | | | | | | | | | As the listview in an input dialog is only used for selecting the entry in place of a combobox, then we should prevent the input method from being enabled. This ensures that it does not show an invalid text cursor on devices like iOS and Android. Change-Id: Ifb854e509573ec2d63d4cbcfa61335ae5b251ab5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Avoid test failures in tst_qtimezone.cpp and Windows 10 1809Kai Koehne2019-01-281-2/+1
| | | | | | | | | | | | | | | | | | | | | | The test started to fail now also for latest Windows 10 Update Restone 2. It's unclear why the test was succeeding before, since this seems a generic Windows API issue. Task-number: QTBUG-64985 Task-number: QTQAINFRA-2255 Change-Id: I804f6a61c63ea70157353d1aee9027d0735073ab Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Prevent QPixmap::load from touching QPixmapCache in non-gui threadsJoni Poikelin2019-01-281-4/+6
| | | | | | | | | | | | Change-Id: Ied0fec48c81298743f694f317dd60e58d356f69a Fixes: QTBUG-72523 Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
* | qtlite: Fix build libs with -no-feature-regularexpressionMikhail Svetkin2019-01-277-4/+50
| | | | | | | | | | Change-Id: I427ff1f8f4986fbf466aba60a9d3de614c1e006f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Add doc note about Qt::MSWindowsFixedSizeDialogHint and High DPIFriedemann Kleint2019-01-271-0/+6
| | | | | | | | | | | | | | | | | | Add a note explaining that it should not be used in multi-monitor environments. Task-number: QTBUG-73232 Change-Id: I7b61cef74eac4082efe849b3d5bdbbe5f04fcdbb Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | QColorDialog: Remove flag Qt::MSWindowsFixedSizeDialogHintFriedemann Kleint2019-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The flag causes issues with High DPI scaling (the OS maintains the size in device pixels when moving across screens). It does not really make a difference (apart from the resize handle appearing) since the dialog uses QLayout::SetFixedSize. Fixes: QTBUG-73232 Change-Id: Iad08427796890582ac05758678d24e3cd707e669 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | SecureTransport: do not set max protocol versionTimur Pocheptsov2019-01-271-12/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is similar to a change we approved recently in OpenSSL back-end. Similar to OpenSSL, not setting the upper limit on protocols allowed to negotiate/use, neatly ends up with the highest available, which is ... TLS 1.2 at the moment, but will silently switch to 1.3 etc. This was also recommended by Apple's engineer who closed a related bug report with 'Won't do' - "do not limit the max, you'll always have the real max supported'. Also, while at the moment we do not allow QSsl::TlsV1_3 and QSsl::TlsV1_3OrLater, if we managed to negotiate it - report it properly, not as 'Unknown'. Task-number: QTBUG-67463 Change-Id: I3f46ea525f06edca03259123809f3b7b1191b1ee Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Fix QMacStyle QPalette warningSamuel Gaist2019-01-261-1/+1
| | | | | | | | | | | | | | The code was still using QPalette::background. It's now using window. Change-Id: I9a47018d559d638ff69b1e4b2d7e2335e04a2a3a Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | xcb: Avoid repaint lags with DnDAlexander Volkov2019-01-253-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The lags can be seen when dragged data is requested for a MIME type. This leads to calling QXcbClipboard::waitForClipboardEvent() which runs a loop in the GUI thread and processes events from QXcbEventQueue. The loop ends when a corresponding event is received, otherwise it makes a delay of 50 ms before the next iteration. Sync with QXcbEventQueue thread by QWaitCondition instead of using the delay. This way the loop will end as soon as possible and Expose events will be processed with minimal delay. Task-number: QTBUG-44849 Fixes: QTBUG-55442 Fixes: QTBUG-62344 Fixes: QTBUG-73253 Change-Id: Ie18d63b51a7260c83d53ffe1169b25e5135dd73b Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Gatis Paeglis <gatis.paeglis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Ability to switch language under platform eglfs/linuxfbElena Zaretskaya2019-01-2514-7/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | I need to change keymap under platforms eglfs and linuxfb (without wayland). I use the function QEglFSFunctions::loadKeymap(const QString&), but there's no way to switch between english and another language than to press AltGr as a modifier. I added the function that allows to change the language. And also added the ability to switch the keymap and language for the platform linuxfb and also added the ability to switch the keymap and language for the platform linuxfb Task-number: QTBUG-72452 Change-Id: I37432cf60d375555bea2bf668ec1387322b4964f Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | QMacStyle: fix PE_PanelLineEdit and PE_FrameLineEdit handlingTimur Pocheptsov2019-01-251-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NSTextField (or its cell) that we use to paint PE_FrameLineEdit overpaints whatever fill color QCommonStyle::drawPrimitive(PE_PanelLineEdit) found in opt->palette and using for PE_PanelLineEdit. As a result the ability to customize widget's colors is lost - we always use the system default colors on top of the custom background color. It's not a problem in 'Dark' mode apparently (controls are transparent there anyway). If it's not 'Dark' mode and common style, indeed, wants from QMacStyle to draw PE_FrameLineEdit - we set the correct background color there. Change-Id: Idad853257f637b028af4bd1181d78afdf079f455 Fixes: QTBUG-73183 Fixes: QTBUG-72662 Fixes: QTBUG-72428 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | tst_QItemDelegate: try to stabilize combobox testChristian Ehrlicher2019-01-252-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tst_QItemDelegate::comboBox() is flaky because sometimes the used QTableWidget does not yet have the focus which prevents a correct editing. Fix it by explictily setting the focus on the widget after it is shown. A similar fix was added for dateTimeEditor() in 9822d57d858068cfe5a07281ef069ef8c4c7b7b3. With this patch the test no longer fails for my on opensuse, therefore remove the blacklisting. Task-number: QTBUG-67282 Change-Id: I907db662ca347f8e8d31e5be215a100377b159ca Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
* | Windows QPA: Cache "forcedScreenForGLWindow" to avoid overheadAndre de la Rocha2019-01-243-7/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | The fix for QTBUG-50371 caused an overhead when you hover over a secondary window like a tool tip, menu or combo box due to the forcedScreenForGLWindow() function being called, which loads dx9.dll and sub-dlls and unloads them afterwards. This fix caches the required info on the first call, and only refreshes it when required by a display/settings change. Fixes: QTBUG-73008 Change-Id: Ie604ba4034ad8041b971f5aa46bd43ae03decd55 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | configure: handle FREETYPE_* variablesEric Lemanissier2019-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | This allows the user to set the following variables: FREETYPE_INCDIR FREETYPE_LIBDIR FREETYPE_LIBS Fixes: QTBUG-72765 Change-Id: Ib70b30f355cc2185c45233e0cfe5e6e55acdf2b6 Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
* | Windows QPA: Move the code installing the filter for WM_TASKBARCREATEDFriedemann Kleint2019-01-241-6/+7
| | | | | | | | | | | | | | | | | | | | Previously, the code was in the constructor, where hwnd was 0 and ChangeWindowMessageFilterEx() failed. Move it into QWindowsSystemTrayIcon::ensureInstalled() after the creation of the message window. Change-Id: Iff4c6d6d6b11bdcace7514ad421c96c94e52bbba Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Windows QPA: Fix tray icon becoming visible before showFriedemann Kleint2019-01-242-1/+27
| | | | | | | | | | | | | | | | | | Use the NIS_HIDDEN flag of the NOTIFYICONDATA structure to prevent it from becoming visible before show when calling NIM_ADD with the icon data. Fixes: QTBUG-73185 Change-Id: If5cc5a4930a889623a5cac84138185ad04765ece Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Windows QPA: Use member initialization in struct WindowCreationDataFriedemann Kleint2019-01-241-14/+10
| | | | | | | | | | Change-Id: I165e795ea75a8d5cb5d3256b3ef377239d24a245 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | Add arm64 winrt targetThomas Miller2019-01-242-0/+59
| | | | | | | | | | Change-Id: I45170216be3a0ffe28a9759ffc12aebca342efd2 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tst_qsslsocket - blacklist several test temporarilyTimur Pocheptsov2019-01-241-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For some reason behavior of SecureTransport has changed from 10.12 to 10.13 and then to 10.14. On 10.13 SecureTransport fails upon receiving the server's certificate with 'Unrecoverable error', before we can do a manual verification and accept the certificate as trusted. Analysis of available source code shows that they, apparently, do not like MD5 hash which our server is using. Until certificate is updated on the server or we switch completely to the Docker-based solution we have to BLACKLIST tests that connect to our current network test-server. Oddly enough, on 10.14 SecureTransport is less mean. Task-number: QTBUG-69873 Change-Id: I7da1883e0970a2f6ddd8385f193b76116d6983e0 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | QAbstractItemView: fix rendering centered/right aligned item textChristian Ehrlicher2019-01-241-13/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5712c62d1cfdcf56c772d8a63d52ad58945f194c introduced a regression for item texts which were aligned right or horizontally centered. The layoutRect was calculated wrong and started below zero and later the correct x offset could not be calculated since QTextLine::x() does not return a calculated value. Fix it by first calculating the complete string and pass it completely to QTextLayout::draw() instead trying to draw the single lines on our own - QTextLayout has a better working algorithm so no need to reinvent the wheel here. [ChangeLog][QtWidgets][ItemViews] Fixed a regression with wrongly drawn centered/right aligned item texts Fixes: QTBUG-34133 Fixes: QTBUG-56759 Fixes: QTBUG-72805 Fixes: QTBUG-72869 Change-Id: I0ed521c3a9d35446d190ac22aa9f2374814fd278 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | testlib: Format durations using C localeTor Arne Vestbø2019-01-241-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | XML expects '.' as the decimal separator, but when using normal %f formatting we end up depending on the user's current locale. By using QString::number() we tap into qt_doubleToAscii which forces the use of the C locale, giving predictable output. Fixes: QTBUG-73227 Change-Id: I04d1adae2ef079442605e962007e5ce3fce896b7 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Always unlock graphics buffer after binding texture during composeAndFlushTor Arne Vestbø2019-01-241-0/+1
| | | | | | | | | | | | | | | | | | | | The code path for re-generating the texture already has the unlock, but the non-regenerating code-path was missing an unlock, causing asserts when the graphics buffer was then attempted to be locked (again) at a later point. Change-Id: Ic65add838360079829b7e81d7c1cfe2274959059 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* | Reorder the elements of the Android manifest to fix a lint warningLars Schmertmann2019-01-231-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Incorrect order of elements in manifest --------------------------------------- The <application> tag should appear after the elements which declare which version you need, which features you need, which libraries you need, and so on. In the past there have been subtle bugs (such as themes not getting applied correctly) when the <application> tag appears before some of these other elements, so it's best to order your manifest in the logical dependency order. Change-Id: I647c6eed71b678f4df65a00fbd51135b93959e11 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: BogDan Vatra <bogdan@kdab.com>
* | Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-01-2375-903/+104139
|\| | | | | | | Change-Id: Icebd151eae0cf9d400319a42573290d1a911ce26
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 17:19:54 +0000