- 22 Sep, 2018 - 1 commit
-
-
Qt Forward Merge Bot authored
Change-Id: I58642f007d8e417f18b67f61a5c4d7270aa34f70
-
- 21 Sep, 2018 - 2 commits
-
-
Leena Miettinen authored
Change-Id: Ie0da8077bc28c8377161ba83078443c6d760dc67 Reviewed-by:
Paul Wicking <paul.wicking@qt.io> Reviewed-by:
Jarek Kobus <jaroslaw.kobus@qt.io>
-
Friedemann Kleint authored
The box was populated using QFontDatabase::standardSizes(), which varies by platform. Task-number: QTBUG-70430 Change-Id: Ie19359bea1e517af206e0d0dfc770668566b4fa0 Reviewed-by:
-
- 20 Sep, 2018 - 2 commits
-
-
Paul Wicking authored
Task-number: QTBUG-67189 Change-Id: I89ec651eb22530e517d9b4cae62da4accb295bd7 Reviewed-by:Simon Hausmann <simon.hausmann@qt.io>
-
Paul Wicking authored
Task-number: QTBUG-67189 Change-Id: I9464103e619eccb6a10be9272cbbdb256c66e917 Reviewed-by:
-
- 14 Sep, 2018 - 35 commits
-
-
Alessandro Portale authored
Use nullptr instead of 0. Change-Id: Ib3120b9c424a274a2d4dd4c42ec5d7cd5bdead65 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@qt.io> (cherry picked from qtbase/a959a0e20695c4b38cf201d194e1ed7b0331e233) Reviewed-by:
hjk <hjk@qt.io> Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@qt.io>
-
Edward Welbourne authored
It's 160ish lines and adequately isolated. Still, it *might* be contributing to compilers being slow (unlikely though that seems) so seemed worth tidying up anyway. Task-number: QTQAINFRA-2117 Change-Id: I9e55e677552c273fdf3480ccefc229fd6fd2b66a Reviewed-by:
Edward Welbourne <edward.welbourne@qt.io>
-
Oswald Buddenhagen authored
make sure the access is properly scoped and does not recurse. Change-Id: Iaa345cd2771811281b9ed6f634c70235a78c3c33 Reviewed-by:
Joerg Bornemann <joerg.bornemann@qt.io> (cherry picked from qtbase/d550ba4e9628cf67880a1c8596629ec598718b3e) Reviewed-by:
-
Oswald Buddenhagen authored
Change-Id: Id867e4653b0ec506332174ae67c9ee21e722c1e3 Reviewed-by:
-
Oswald Buddenhagen authored
at the time this patch was conceived, it was meant as an exercise in getting rid of usages of ProString::toQString(m_tmp). however, this was meanwhile superseded by use of toQStringView(). but the change itself should have been done a long time ago already, and there is no harm in going through with it. on the way, this also unifies and fixes some of the error messages. Change-Id: I337aff994c508df783df4794c3fa0762d83a691b Reviewed-by:
-
Oswald Buddenhagen authored
... and make it explicit where we can't do that for semantical or backwards compat reasons. most urgently, this fixes an assertion failure when $QMAKEFEATURES contains empty paths (e.g., due to a trailing semicolon). notable observation: QByteArray::split() has no argument for the split behavior (it always keeps empty parts). Task-number: QTBUG-47325 Change-Id: I72d4b2e154a2ed1802cfa98fb4a5211a68e43231 Reviewed-by:
-
Oswald Buddenhagen authored
Change-Id: If067368529f89347a4618a24e2737e04b4fc0ce3 Reviewed-by:
-
Oswald Buddenhagen authored
Change-Id: If82a5387a03f400cde04d582dd7e8567a2b661a0 Reviewed-by:
-
Oswald Buddenhagen authored
Change-Id: I7555de5c72a9250b31e20fc60e39680d19882fcb Reviewed-by:
-
Oswald Buddenhagen authored
sync-up with qt-creator; no effect on qmake or lupdate. Change-Id: I926bc97fe6fa510ac5a8fe77b64014333a69bd04 Reviewed-by:
-
Alessandro Portale authored
sync-up with qt-creator; no effect on qmake or lupdate. Change-Id: I34b42bd19e0de973deb2291e91f306d1ca7c630e Reviewed-by:
-
Oswald Buddenhagen authored
sync-up with qt-creator; no effect on qmake (which has no cumulative vfs) and lupdate (which has only a cumulative vfs). 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 Reviewed-by:
Robert Loehning <robert.loehning@qt.io> Reviewed-by:
Orgad Shaneh <orgads@gmail.com> Reviewed-by:
Eike Ziller <eike.ziller@qt.io> Reviewed-by:
Tobias Hunger <tobias.hunger@qt.io> (cherry picked from qtcreator/424639ecac9d2e404d2bfaff7f46b45ed98664b8) (cherry picked from qtcreator/a8010b0fff47d903d4a1f80e3adb1a2ef41beb33) (cherry picked from qtcreator/d03fb350672d311dccc06f0bcb4da744a3c99745) (cherry picked from qtcreator/1ddfb443b686ef04cc0e28363308ce70d01f0d73) Reviewed-by:
-
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:
-
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:
-
Oswald Buddenhagen authored
Change-Id: I9cfa2c9476d3d7fdb68b0a23e175eea4b3b11ad9 Reviewed-by:
-
Edward Welbourne authored
Thanks to QTBUG-61373, this qmake function was called with /usr/local/5.10.1 as baseDir, which isn't absolute, leading to an assertion failure. We could raise the error within qmake but it proved easier to simply resolve any non-absolute baseDir using PWD, before trying to use it as an absolute path. Did the same for $$absolute_path(). Documented both. Adjusted the assert that caught this to report any non-absolute path that upsets it. Added simple tests, fixed an existing test. Task-number: QTBUG-66156 Change-Id: Icfef2e2f5b236e071177c9beffa38d71bf404292 Reviewed-by:
-
Edward Welbourne authored
For Q_OS_WIN, a path is only truly absolute if it includes a drive letter; merely starting with a slash is not enough. (We can't support UNC paths, so don't even try: qmake runs various commands in the source directory using CMD.exe, which doesn't support UNC as PWD.) This requires, when resolving a path relative to a root, transcribing the root's drive to such not-quite-absolute paths. Changed QMakeGlobals, $$absolute_path() and $$relative_path() to now use IoUtils::resolvePath() rather than delegating to QDir's absolute path method, since that doesn't correctly recognize the need for a drive letter (and qmake did run into problems with some paths, from splitPathList and a failing test, as a result). Moved existing ioUtils tests for handling of relative / absolute paths out into separate functions and expanded significantly. Fixed some existing tests to use an absolute path where one is needed; added two tests involving driveless (but rooted) paths; and fixed the test init to set a value for QT_HOST_DATA/src property (the lack of which lead to an assertion failure with this fix). Task-number: QTBUG-50839 Change-Id: I2bfc13c1bfbe1ae09997274622ea55cb3de31b43 Reviewed-by:
-
Oswald Buddenhagen authored
the replacement value may well constitute the whole output string - this is in fact common, given this rather typical usage pattern: BAR = $$replace(FOO, -flag, -otherflag) this must be considered when constructing the return value. compare 3c8134958c6. as of now, this is irrelevant, as QString::replace(QRegExp, QString) will always memcpy the replacement into a detached copy of the target, but one never knows. Change-Id: Ia1f271f45023746040fc28ce6d88a6609e05e5c2 Reviewed-by:
-
Oswald Buddenhagen authored
technically, we should not rely on the i/o classes not storing the strings beyond the instantiated object's life time. Change-Id: I0990769b3cf86860184869036c096c531160e9be Reviewed-by:
-
Oswald Buddenhagen authored
property values are de-facto guaranteed to be backed by full QStrings, so there is nothing to be gained from using the raw data optimization, while doing so risks raw data leaks. Change-Id: I3d43da9aaadd4d5811c4b1a9d7ac734049da423c Reviewed-by:
-
Oswald Buddenhagen authored
it's not clear why detaching would be necessary; there is no danger of a raw data leak here. concatenating a QStringRef with a non-empty QLatin1String (the only expected use of this overload) will yield a detached QString anyway, so this makes little difference in practice. amends d5014234f. Change-Id: I521c0e89a8b0c1ae62b1450e81b0ae91a931bcfa Reviewed-by:
-
Oswald Buddenhagen authored
no m_tmp is involved any more in this code path; it uses QStringRef. amends 14893e28 . Change-Id: Ib272d61edfb150a549c5e6a9a60d53502702e802 Reviewed-by:
-
Oswald Buddenhagen authored
saves some noisy toQString() uses. Change-Id: I62a9e2725c4baabac311124d19c7d8b40f54c8f7 Reviewed-by:
-
Oswald Buddenhagen authored
... in $$basename(), $$dirname(), and contains(). the latter case is marginal, as it only applies to mutuals which are regexes, which i don't remember ever seeing used. QRegExp saves a copy of the matched string, so it's necessary to alternate between two temporaries to avoid detaching. we already did that in most places. Change-Id: I97b8294585c17c76d1756f83971f42cb88353af0 Reviewed-by:
-
Oswald Buddenhagen authored
the m_tmp array is a member, so the index toggle for accessing it also needs to be one - otherwise, odd iteration counts will defeat the mechanism. Change-Id: If7a800ed5a4b4168625daf1ebbd5d2d164569d8e Reviewed-by:
-
Oswald Buddenhagen authored
in most cases, the main advantage is not using toQString(m_tmp), which reduces the possibility of raw data leaks. in cases where we used toQString() without temporary, this is a slight optimization. Change-Id: Ib343acffd383aa2c4fefab75fb52762fb534dfc6 Reviewed-by:
-
Oswald Buddenhagen authored
The strings remember in which file they were created/assigned. However, this used a non-counting reference to a ProFile, which could become dangling. If a subsequent ProFile re-used the exact same address, a string's source would be mis-identified, which would be fatal in conjunction with discard_from(). Since we actually need only a unique id for comparison, let's use an integer for that. Task-number: QTBUG-62434 Started-by:
-
Simon Hausmann authored
Similar to the two parent commits, this patchs preserves the time stamps of files we install as a result of recursive directory copying. Change-Id: Id5931a467196d5cd67acfa0deffc2488af8a3669 Task-number: QTBUG-59004 Reviewed-by:
-
Simon Hausmann authored
On non-windows platforms, we use the "-p" parameter of install(1) to preserve the last modification timestamps of files. On Windows the use of copy does not preserve them. As a cross-platform solution, this patch introduces a simple built-in install command in qmake to copy files. Task-number: QTBUG-59004 Change-Id: I3064d29a2b8c7b009a1efbf8f00b84c079ea5417 Reviewed-by:
-
Marc Mutz authored
Add ProString::toQStringView() to avoid creating QStrings just to pass them to QString::arg() (single-arg; multiArg() does not, yet, accept QStringViews). I could have used the existing toQStringRef() function, but QStringRef is a tad more complex to copy and quite a bit less future-proof. Change-Id: I344c46f301768e844c487d36ce3e6cb276de8843 Reviewed-by:
-
Marc Mutz authored
Change-Id: I91a65776124f88a7e2e4778dbe9154b597f52212 Reviewed-by:
-
Simon Hausmann authored
On POSIX compliant platforms, the default precision we apply to preserving time stamps is seconds. However we can do better and use utimensat() - if available - to increase the precision to nanoseconds. The values are provided by statbuf's st_mtim. This is guarded for compatibility with older systems, similar to commit 494ced13292fa9d7b572f5310090f6b8fab36e26. Change-Id: I6928660230d84f8511bf0f58e268906d2e575e04 Reviewed-by:
-
Oswald Buddenhagen authored
in particular, -before (just for symmetry, as it's the default), -early (the actual objective), and -late (for symmetry again). Change-Id: I274303582a348b052c3e5106ff360ab4fd7d4ee2 Reviewed-by:
-
Oswald Buddenhagen authored
the arguments after '--' are by definition meant only for the top-level project, as that's where configure is invoked from. passing them to sub-projects just adds noise to the make output and misleads users. note that this specifically does not support qmake -r, which will break if the subprojects rely on the arguments being absent. this isn't a problem, because the qt build doesn't support qmake -r anyway. Change-Id: I7ecff6212ce3137526005fc324a4a7ae45e3345e Reviewed-by:
-
Oswald Buddenhagen authored
there is no point in iterating BAR if FOO is (or became) empty. Change-Id: I86c89bf0ad726a5ab7ead990a27ef7cc32caebbf Reviewed-by:
-
