- 21 May, 2013 - 10 commits
-
-
Oswald Buddenhagen authored
instead of having them "not implemented" (and consequently getting errors), just let requires(), system(), mkpath(), write_file(), touch() and cache() do nothing. this is likely to cause followup failures which are harder to detect, but the amount of scary noise we are producing now is not really acceptable. furthermore, in qtcreator these failures actually terminate the "precise" evaluation, which breaks Run Configurations. Task-number: QTBUG-28159 Task-number: QTCREATORBUG-8550 (in different repo) Change-Id: I1bdeb759e895e4200f09332dadf8a6cef348182f Reviewed-by:
Daniel Teske <daniel.teske@digia.com> Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
in the case of sprintf it's surprising, in the case of join it's anti-thetical. Change-Id: I4eb7e56d31ac6ed68adf852f1a19b33554d38eb4 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/ae94bf2b7a6373def9239ae5f54b143e1f6ffe09)
-
Oswald Buddenhagen authored
any of the directories may be the root, which would lead to double slashes in the constructed filenames. Change-Id: I053e167a19b795b40e780fc29db356c7f24d286a Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/97be79012cd39d1d0e7748d5c500d86c3becc258)
-
Oswald Buddenhagen authored
don't count parentheses, don't nest quotes, don't create empty elements. the backslash still escapes only quotes (and itself) - $$list() (one of the main users of this function) is commonly used with (windows) path lists, so letting it escape anything would make a royal mess. Change-Id: I29252fbe14fd6d28217450ec41cf8acfb2e30681 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/6c22b9b3e86d1617665f7b81b105c032f43c6d72) (cherry picked from qtbase/a5c2ab47867a558d6f8f62126fb8e4f2777cfe06)
-
Oswald Buddenhagen authored
this allows skipping an entire feature file if a condition is not fulfilled, without putting the whole body inside a conditional. Change-Id: I84fe9c94dda58c794fb52c3f163b40563b0db30a Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/525eb337670f61078383c20ad9be274dcf2d0928)
-
Oswald Buddenhagen authored
we have proper fallback paths further down the line. Change-Id: I3648cc985d21bbec4c2c24e179830db4467af210 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/0dedf8c3403923b963c51eb65d9cbe838d5ba0d4)
-
Tor Arne Vestbø authored
Instead of after parsing the makespecs, were we assumed QMAKE_PLATFORM had been set by the makespec and did an explicit update. Allows loading platform specific features from within a makespec after updating QMAKE_PLATFORM. Change-Id: I0eb3b7fb88ce48b00a384850c5d87223c06234d7 Reviewed-by:
Tor Arne Vestbø <tor.arne.vestbo@digia.com> (cherry picked from qtbase/4dd29248cd43ff730f7432b51a443b72fad3523d) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
$$(FOO) would automatically split the contents of the environment variable at whitespace (and interpret quoting inside it). the way to prevent the splitting (but not the quote interpretation) would be using "$$(FOO)". this behavior is entirely unexpected and thus an incredibly effective source of quoting problems - according to a grep over the whole qt sources, there isn't a single case where things were done right. in qt creator, well over half the cases are wrong. also, the "feature" seems entirely pointless: nobody uses spaces as separators in environment variables. consequently, simply remove it, even in a patch release. i'm postulating that nobody will complain. Change-Id: I9ed3df1b0d1ef602acd78ceb118611d294561da6 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/566d28316dd73bfe4a8ea34839989ee9df7e3895)
-
Oswald Buddenhagen authored
it's a pretty braindead thing to implement control flow statements as (built-in) functions. as a "side effect", this fixes return() value handling for lists. (cherry picked from qtcreator/f53ed6c4b3feca59a94d4f0de8b1a7411122e30e) (cherry picked from qtcreator/f529e22ec38fb9a656d74394e484d2453cf42c69) Change-Id: I59c8efa0e4d65329327115f7f8ed20719e7f7546 Reviewed-by:
Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by:
Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qtbase/8400896cfe3fbef7666329a2920bd0dbdd5890af) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
to reduce collateral damage from parse errors. (cherry picked from qtcreator/00c0d0d5e42d28e03c2846c17d3acbcd8420859d) Change-Id: Ic59700d657069d3b15372509b4bff966057d27a9 Reviewed-by:
Qt Doc Bot <qt_docbot@qt-project.org> Reviewed-by:
Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from qtbase/ae3f95a951334dee001e37c305e4d7bf91c0d1b3) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 19 Mar, 2013 - 3 commits
-
-
Oswald Buddenhagen authored
qt_tool.prf handles the magic for us. Change-Id: Ifb8e7fd7ff0e46b9b274c9d156e048e89586ab2c Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
the bootstrapped library now fakes the translation api sufficiently well to enable unifying the usage. Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e Reviewed-by:
hjk <hjk121@nokiamail.com>
-
Oswald Buddenhagen authored
utf-16 is optionally used by java and msvc. it doesn't hurt to support it. all other encodings are not used anyway (other than 8-bit pass-through, but this is a matter for (the also removed) CodecForTr). Change-Id: Ie6482e187a9a8276918b53e97faeac88a40eb52c Reviewed-by:
hjk <hjk121@nokiamail.com>
-
- 12 Mar, 2013 - 2 commits
-
-
Oswald Buddenhagen authored
qt-based code is expected to be utf8-encoded nowadays. the respective c++ interfaces have been purged in 5.0 already. Change-Id: I592b49f198aae05212afbf8d3aa2b01b1e9369dd Reviewed-by:
Robin Burchell <robin+qt@viroteck.net>
-
Oswald Buddenhagen authored
at the time of release it will be almost five years since we introduced TS 2.0 and stopped writing 1.1 by default, so there shouldn't be much of a need to write such files any more - and this commit doesn't even remove 1.1 reading capability (because it comes for free so far). Change-Id: Ie54fe31f83733ef944306c01301c0ec0e9bcb8bf Reviewed-by:
hjk <hjk121@nokiamail.com>
-
- 06 Feb, 2013 - 6 commits
-
-
hjk authored
Change-Id: I2845fdefb8b32de227f08017e0e3ad98923d1c87 Reviewed-by:
hjk <hjk121@nokiamail.com> (cherry picked from qtcreator/52be02d1cbbf69d4f82c517c7b633ed3d13b1007) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Orgad Shaneh authored
#!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by:
hjk <qthjk@ovi.com> (cherry picked from qtcreator/29a93998df8405e8799ad23934a56cd99fb36403) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
this is undeniably a new feature, but it's needed for a bugfix. Change-Id: I951a3128eb580404ee0c7e3cdcb4d6170e899f70 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/87054805872429c1c17135f9ae5364b050d3fdff) Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com>
-
Oswald Buddenhagen authored
otherwise variable assignments (including -config options) from $QMAKEFLAGS are lost. Change-Id: I818e9372d2b0ff44333dc3eb8fc3420f84ab01c5 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/864e1ceaf628e823103ae2d28d2c983400ba38c7)
-
Debao Zhang authored
Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/4d55b473b3a1514c53dc5ee8116e2c86e4f62eb6) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Joerg Bornemann authored
Change-Id: I0c8b48e6491486ca829ce24ca2e284294ba0138a Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/9a1183b400748aa51132dd17d004d9d6e560b5b8) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 10 Jan, 2013 - 1 commit
-
-
Sergio Ahumada authored
Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by:
Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@digia.com>
-
- 26 Nov, 2012 - 1 commit
-
-
Konstantin Ritt authored
Uncomment "Missing" languages that were added recently. Use modern language names instead of compat ones. Change-Id: I1f4669ed17e4c814607d93fdae16eff20485d98e Reviewed-by:
Friedemann Kleint <Friedemann.Kleint@digia.com>
-
- 22 Nov, 2012 - 1 commit
-
-
Friedemann Kleint authored
Change-Id: Ie03060fe59db43fef83f055b7000240368fe9d46 qtbase: 3791d21f72a4c7035cd1db42c36dbd1dc7efd0f6 Reviewed-by:
hjk <qthjk@ovi.com>
-
- 13 Nov, 2012 - 4 commits
-
-
Oswald Buddenhagen authored
this is needed for being able to x-compile translations. Change-Id: Ia2a00e8195f84feaedd036e6b7b83df373425b38 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I8c987e8eed555c9c976732e216553d8002ee2b87 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I52a74c7ad499312b35b3a25c6ad6d571e0dedb61 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
they are from the times when these files were part of the qt api Change-Id: Ic4b0d6af68e4cbba14e7efe0ca0bb901641e021b Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 05 Nov, 2012 - 8 commits
-
-
Oswald Buddenhagen authored
Change-Id: I024031a03e44151b0b350dea83bd5bae1740568f Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
instead of symlinking (on unix) or creating a forwarding spec (on windows), just put the default specs into (the bootstrapped) QLibraryInfo. Change-Id: I595500ef7399f77cb8ec117c4303bc0a2ffe505f Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com> (cherry picked from qtbase/7d20f3dd1065a20b40cb4689783fba05190fe317)
-
Simon Hausmann authored
When writing a file with write_file() we have to inform the pro file parser cache to discard the file if it's existant in the cache, to ensure that calling include() after write_file() always works. Change-Id: I7d09269a57de55ca30b0e11dd40770de9f919f64 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/f45d6414ad6ef1d75f049a61411cd954bcae29c3) Reviewed-by:
Simon Hausmann <simon.hausmann@digia.com> Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Marc Mutz authored
This is an automated change performing the following replacements: join\("(.)"\) -> join('\1') join\(QLatin1String\("(.)"\)\) -> join(QLatin1Char('\1')) join\(QStringLiteral\("(.)"\)\) -> join(QLatin1Char('\1')) Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/f4d47945ba17db276e94046473816014ed0342e9) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Marc Mutz authored
Same reasoning as for 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies. Adding the overload was easier than to teach a Perl script to distinguish between QStringList and ProStringList instances... Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92 Reviewed-by:
Thiago Macieira <thiago.macieira@intel.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from qtbase/cbf447069cfeb799ff5e09902be065d77f2e7707) Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
otherwise we end up in the source tree, which is counterproductive. Task-number: QTBUG-26869 Change-Id: Id44a94f827dc285c75b9b243c8ef6478e668e3ff Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/04cd23428a4f2cfa5ee02b70f2086ff832aae925)
-
Oswald Buddenhagen authored
the original value is not used any more after the final resolution. Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com> (cherry picked from qtbase/cc2cd0db5d0c53605ab93f796765667ead1920e8)
-
Oswald Buddenhagen authored
don't filter out ^QMAKE_.*: - QMAKE_MKSPECS is not printed any more, so needs no filtering - QMAKE_VERSION can be simply used now, as we are now rather close to the real qmake - QMAKE_SPEC and QMAKE_XSPEC need to be fetched - this fixes the default spec resolution Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 25 Sep, 2012 - 1 commit
-
-
Iikka Eklund authored
Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by:
Janne Anttila <janne.anttila@digia.com> Reviewed-by:
Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by:
Lars Knoll <lars.knoll@digia.com>
-
- 20 Sep, 2012 - 3 commits
-
-
Oswald Buddenhagen authored
now that the instantiation is cheap, we can do that. Change-Id: Ifd2c3155aa976ec634d4ed96ae796a60584ca9a4 Reviewed-by:
hjk <qthjk@ovi.com>
-
Oswald Buddenhagen authored
... by removing an allocation. move some of the functions out of the class to avoid polluting the header. Change-Id: If0d3638215e59f7d88be7217e4d3abcbfd7a201e Reviewed-by:
hjk <qthjk@ovi.com>
-
Oswald Buddenhagen authored
no need to re-calculate the matrix for the reference string every time. Change-Id: Id4432d9fa78d5a065cfe1549a908454710e0ae26 Reviewed-by:
hjk <qthjk@ovi.com>
-