- 04 Apr, 2018 - 4 commits
-
-
Kari Oikarinen authored
Instead use QSignalSpy to wait directly for the expected events. Change-Id: I319302ea7177fe690b5d885347c505454904518e Reviewed-by:
Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by:
Erik Verbruggen <erik.verbruggen@qt.io>
-
Leena Miettinen authored
Change-Id: I687ea95c0985c361ffb75ea3c162615b0abbb7f7 Reviewed-by:
Eike Ziller <eike.ziller@qt.io> Reviewed-by:
Paul Wicking <paul.wicking@qt.io> Reviewed-by:
Topi Reiniö <topi.reinio@qt.io>
-
Kari Oikarinen authored
It is suspected that the fault actually lies in CI infra. Amends e3cf2a1a . Task-number: QTBUG-66311 Change-Id: I967da283f0b94be1d0b99481d0cbd15ca7f98d45 Reviewed-by:
Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
Gabriel de Dietrich authored
This amends commit f8b6d104 . Change-Id: I77a48e68ec7db791b843fe4dfeddc4c6fedf6380 Reviewed-by:
Richard Moe Gustavsen <richard.gustavsen@qt.io>
-
- 03 Apr, 2018 - 4 commits
-
-
Kari Oikarinen authored
These two places were sort of manually implementing QTRY_VERIFY except that they never time out. Change-Id: I136e6c7400194327c0475c6acfc019825ccec1b5 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by:
Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by:
Sami Nurmenniemi <sami.nurmenniemi@qt.io>
-
Kari Oikarinen authored
Use QSignalSpy::wait or QTRY_VERIFY instead. This shaved off ~200 ms of the running time of the test and is more reliable. Some unconditional qWait()s still remain in this test. They are giving an opportunity for the wrong thing to happen and thus are not waiting for any specific condition to be fulfilled. Task-number: QTBUG-63992 Change-Id: I25a4470fe8d6a5b8b5039b3ed77321d24faa1707 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io> Reviewed-by:
Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by:
Edward Welbourne <edward.welbourne@qt.io>
-
Kari Oikarinen authored
Amends 594fe5c4 . Change-Id: I0fb5ab79d895cfd9698db9b4a4394481299a7e1a Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-
Morten Johan Sørvig authored
QWindows with transparent pixels (of which QMacNativeWidget is an example) must be composited, even if they are content views. This will display the NSWindow background instead of solid black for the areas where the Qt backingstore has transparent pixels. Change-Id: Ibee1327e11bc64975900b4c5d632dd5f103da4c8 Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-
- 30 Mar, 2018 - 1 commit
-
-
Gabriel de Dietrich authored
Apple LLVM version 9.1.0 (clang-902.0.39.1) Error message: .../qfontengine_coretext.mm:827:20: error: qualified reference to 'QFixed' is a constructor name rather than a type in this context return QFixed::QFixed(int(CTFontGetUnitsPerEm(ctfont))); Change-Id: Iebe26b3b087a16b10664208fc8851cbddb47f043 Reviewed-by:
Konstantin Ritt <ritt.ks@gmail.com>
-
- 29 Mar, 2018 - 16 commits
-
-
Simon Hausmann authored
For correct debug/ and release/ suffix substitution and thus avoid concurrent access to generated files, we have to declare the output directory variable used by qtquickcompiler.prf in qtdeclarative here and enable it for substitution. Change-Id: Id8483daffdf1b9990396c55f7bc0d08a2f65cafd Task-number: QTBUG-66675 Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-
Friedemann Kleint authored
Use QTRY_VERIFY instead of hard-coded wait for the tooltip to appear. Also use QTRY_VERIFY to verify that no top level widgets are left over to account for tooltips and effect windows. Change-Id: Ia9835fdc480c6abb034f6fc4ad3d6b32751ee536 Reviewed-by:
Sami Nurmenniemi <sami.nurmenniemi@qt.io> Reviewed-by:
Kari Oikarinen <kari.oikarinen@qt.io>
-
Samuel Gaist authored
The current snippet uses integer literals that will trigger the Wnarrowing warning with recent version of gcc. This patch replaces them with character literals to fix this warning. Change-Id: Iffad495f24cc9d4c1674a7fe3f6b45c46a625ff8 Reviewed-by:
Sze Howe Koh <szehowe.koh@gmail.com>
-
Samuel Gaist authored
This patch updates the frozen column example to use QTextStream which offers a more convenient way to read text files and also takes care of converting the 8-bit data stored on disk into a 16-bit Unicode QString. Change-Id: Ifd03903ac14b48b026d8770cda726f8ed2756ab4 Reviewed-by:
Sze Howe Koh <szehowe.koh@gmail.com>
-
Oswald Buddenhagen authored
clearly, rcc was meant to support wildcard patterns in <file> entries. however, since its inception, this code was broken: the exists() check was done first, so the decomposition into path and wildcard would never happen. as actually supporting wildcards woulds just complicate matters, simply remove that dead code. on the way, re-arrange the code in a way that is advantageous for subsequent changes, and insert a case that catches non-regular file nodes (this would have previously run into the wildcard code). Change-Id: Iac1a168b844ef5b176f6cc45d6a779fde0bec6f7 Reviewed-by:
hjk <hjk@qt.io>
-
Oswald Buddenhagen authored
Change-Id: If82a5387a03f400cde04d582dd7e8567a2b661a0 Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
sync-up with qt-creator; no effect on qmake. Change-Id: I7555de5c72a9250b31e20fc60e39680d19882fcb (cherry picked from qtcreator/2cb7c81e620d224d386860a637dc889acb15435e) (cherry picked from qtcreator/89868ee2b9093ecf40602ae302b991d6a60014b0) (cherry picked from qtcreator/03e699ce2985eedcd33d247aa47d04b14bc4bc04) (cherry picked from qtcreator/61419e7bf0f3bff6dcf63876b05b72c56e60c2a8) (cherry picked from qtcreator/19eaf87ef95a510351557119a955223a4aeea7b3) (cherry picked from qtcreator/3080bda0661989e88dfa62101b4c3f5d5e6754a1) (cherry picked from qtcreator/99714239b616e628ff4e0afe3db7eb7511ccf569) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
sync-up with qt-creator; no effect on qmake. Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04 (cherry picked from qtcreator/8a69c254757eab7852443b5e4bd5eafb68908d3d) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Alessandro Portale authored
sync-up with qt-creator; no effect on qmake. Change-Id: I34b42bd19e0de973deb2291e91f306d1ca7c630e (cherry picked from qtcreator/15148d8e4454ff3277131ea52a4204c5fa0b7ab0) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
sync-up with qt-creator; no effect on qmake. comment on cherry-pick: this is actually a lot more than a cherry-pick, because the dual VFS needs to deal with the file ids which were concurrently introduced on the qmake side. Change-Id: I2c1eb16c97526fa275a1c6a2eae9266d385859ac (cherry picked from qtcreator/424639ecac9d2e404d2bfaff7f46b45ed98664b8) (cherry picked from qtcreator/a8010b0fff47d903d4a1f80e3adb1a2ef41beb33) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
it now does not see anything except regular files and directories any more. that's not expected to be a problem, given the function's scope. Change-Id: I53063ad8cacb3afe5cc1baf6d6d5feba3465e74f Reviewed-by:
Tobias Hunger <tobias.hunger@qt.io> (cherry picked from qtcreator/cf82f210804151452fce3cddb3cb2793dab976eb) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
when the QFile object is already constructed, querying whether the file exists is actually cheap, so do it right away instead of later on demand. that makes the calling code a bit cleaner. fwiw, that we need to explicitly query the file's existence at all is a result of QFile's completely useless error "codes" (which merely say which function failed, as if the caller would not know). Change-Id: Ifec39d05b1713d8128046f679287e510f10e45dc Reviewed-by:
Tobias Hunger <tobias.hunger@qt.io> (cherry picked from qtcreator/5ba32e3484ead2e35cc7732dcd59a97e7459dbfd) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
Change-Id: I9cfa2c9476d3d7fdb68b0a23e175eea4b3b11ad9 Reviewed-by:
Tobias Hunger <tobias.hunger@qt.io> (cherry picked from qtcreator/c0ddf0a34407f9d3ad9f575176550ba33d536d12) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Oswald Buddenhagen authored
just a sync-up from lupdate; no effect on qmake itself. alternative source: qt-creator/7e86b98836342035684cc1c1aa49292224faed07. Change-Id: I5e10b44637d527799f55c578a99076eb4750f131 (cherry picked from qttools/8e7e60dbdea04c943bc6d50290db12d3fefd39f2) Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Thiago Macieira authored
This time, the issue was that we could race a wait and a wake. A multi- token waiter would not notice that the number of tokens changed because it only performed a fetch-and-OR, then waited on the high part which did not change. That means the futex_wait() would succeed, when we wanted it to have failed. So we have to bring back a portion of what commit 081c001d removed: we need to keep both the token count and the waiter count in the high word. Task-number: QTBUG-67214 Change-Id: I04a43ee94975482f9e32fffd151e467a9e0030b3 Reviewed-by:
Mårten Nordheim <marten.nordheim@qt.io> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
Mauro Persano authored
On Windows, we must update the transient children of a window that's about to be destroyed or its transient children will be destroyed as well. This is already being done in the case of a single transient child, but there are still problems when there are more than one. Change-Id: Ib0de6767bf43dca508ecdb87cbdfedb59e9146e8 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@qt.io>
-
- 28 Mar, 2018 - 6 commits
-
-
Jürgen Hunold authored
Task-number: QTBUG-63512 Change-Id: I7e0c4e144262a175c39508090c935c73186fac65 Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@qt.io>
-
Kari Oikarinen authored
Task-number: QTBUG-66311 Change-Id: I8b7536bc11763b8405ecbe5c86be94c2af036c6e Reviewed-by:
Ville Voutilainen <ville.voutilainen@qt.io>
-
Kari Oikarinen authored
Has been flaky on those platforms in CI. Task-number: QTBUG-67254 Task-number: QTBUG-66216 Change-Id: Ia1a718a23b1992fcc0e85bf49b714bc43acc4ce2 Reviewed-by:
Ville Voutilainen <ville.voutilainen@qt.io>
-
Kari Oikarinen authored
Otherwise the ::debug() test fails when a build does not print qDebug() messages. Change-Id: I3f3c4b3c7d74004abe5ed8d7ac52164d4f88ef1f Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io>
-
Kari Oikarinen authored
The future does not actually have a result() member function that takes an int. The correct function is resultAt(). But that is also available directly in the QFutureWatcher, so refer to that instead of advising to get to the future. Change-Id: I53d267b4b48b1171bf611e11130b9dacabc059a4 Reviewed-by:
Martin Smith <martin.smith@qt.io>
-
Olivier Goffart authored
The problem is that qCountLeadingZeroBits is calling qPopulationCount which is only conditionally constexpr, so qCountLeadingZeroBits can only be marked constexpr if qPopulationCount is also. On MSVC2017 64bit this is not a problem because it uses builtins function in this case. (which is not constexpr, but it works because the compiler is not forced to diagnose the problem because of the "?:" operator. The error being fixed is: qalgorithms.h(847): error C3615: constexpr function 'qCountLeadingZeroBits' cannot result in a constant expression qalgorithms.h(858): note: failure was caused by call of undefined function or one not declared 'constexpr' qalgorithms.h(858): note: see usage of 'qPopulationCount' Task-number: QTBUG-67259 Change-Id: I65a3dfae12ca49394bec14ffefdd41a07fee1c32 Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com>
-
- 27 Mar, 2018 - 7 commits
-
-
Gabriel de Dietrich authored
We don't need to accommodate for the fake frame anymore. Change-Id: I2d84441d4239e1ff68f640dffda1a0d1a97fa2b3 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io>
-
Gabriel de Dietrich authored
Change-Id: I7c6ba0c3818a3e269e0350153cbde355bafd249a Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io>
-
Gabriel de Dietrich authored
sizeFromContents() just adds 10 points to the tool button size and returns. Therefore, the HITheme code that used to be shared with CT_PushButton becomes effectively dead. Change-Id: Ib0519b0037ec3097a00e2c14067d851040853499 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io>
-
Gabriel de Dietrich authored
This also removes a few HITheme-related functions that are no longer needed. Change-Id: I356938d1e99f5fed106c945a94050fa35db58716 Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io>
-
Gabriel de Dietrich authored
We guarantee the same sizes as previously with HITheme for most common cases. Exotic cases may break and will be fixed along the way. Change-Id: I3e3e6ea702c7489c1cbaa821a30916f63c440c1f Reviewed-by:
Morten Johan Sørvig <morten.sorvig@qt.io>
-
Andy Shaw authored
Also expands the tst_qsqlquery::batchExec() test to account for this case and generally test the functionality. In addition it is made to be more robust to avoid any discrepencies with the testing data. The test in general is also cleaned up to enable more of it being tested with the different database drivers where possible. An expected fail is added for MySQL due to the fact that it has a bug where null timestamp entries are being converted to the current datetime when adding it as a bind value. Change-Id: I0061bd1c69ae35b4858afc49420f13ce59cf48ae Reviewed-by:
Edward Welbourne <edward.welbourne@qt.io>
-
Pablo Marcos Oltra authored
We were releasing only the memory of latest iteration since cfCerts was being rewritten in every iteration, invalidating the RAII. Hence, we need to define the variable within the loop to ensure the object is released for every iteration. Task-number: QTBUG-66937 Change-Id: Iaa9365168728337c6cdaac4aef686652903cf5a9 Reviewed-by:
Timur Pocheptsov <timur.pocheptsov@qt.io>
-
- 26 Mar, 2018 - 2 commits
-
-
Eirik Aavitsland authored
Clipping enabled state would not always be correctly restored for the raster engine (other engines work fine). The raster engine's QClipData object is sometimes shared between painter state objects on the save/restore stack. QClipData has its own enabled flag, and this could then come out of sync. Fix by making sure we sync the enabled state on restore. Task-number: QTBUG-58789 Change-Id: I81e6254ebb93df6e153bbef58e32a885273e3224 Reviewed-by:
Allan Sandfeld Jensen <allan.jensen@qt.io>
-
Svenn-Arne Dragly authored
Previously, we would divide by zero in BezierEase::findTForX if factorT3 was zero when solving the cubic equation. This change fixes the problem by adding solutions for the special cases where the cubic equation can be reduced to a quadratic or linear equation. This change also adds tests that cover cases where the equation becomes quadratic, linear or invalid. Task-number: QTBUG-67061 Change-Id: I2b59f7e0392eb807663c3c8927509fd8b226ebc7 Reviewed-by:
Christian Stromme <christian.stromme@qt.io>
-