- 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>
-
- 03 May, 2013 - 2 commits
-
-
Oswald Buddenhagen authored
Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
Oswald Buddenhagen authored
Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132 Reviewed-by:
Joerg Bornemann <joerg.bornemann@digia.com>
-
- 17 Apr, 2013 - 1 commit
-
-
Mitch Curtis authored
It currently loads source files as latin1, which means unicode characters are not supported. 4944ea05 removes -codecfortr and hence the ability to specify an encoding. lupdate will then treat all code as UTF-8, so this patch does that too. Task-number: QTBUG-27238 Change-Id: Iefed45de5b4925fee267834a5ed93457fc45b700 Reviewed-by:
Debao Zhang <hello@debao.me> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 16 Apr, 2013 - 2 commits
-
-
Leena Miettinen authored
This is difficult to maintain and users always get the up-to-date information by executing the help command. Change-Id: I13e9b7d7f89bb60d0b73cbbc721d6a8a05112a31 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Leena Miettinen authored
Move information from the Release Manager topic and add information about QML sources in the Qt Linguist Manual. Change-Id: I0d2a2ea68a2e7e94895b41436d9f973d8c2cb2aa Reviewed-by:
Leena Miettinen <riitta-leena.miettinen@digia.com>
-
- 15 Apr, 2013 - 1 commit
-
-
Leena Miettinen authored
Add links to topics that describe i18n in detail for C++ and QML. Change-Id: I47b95b040dd9efe4eb8951dedbf94ab8988316e5 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 12 Apr, 2013 - 1 commit
-
-
Leena Miettinen authored
Make the topic task-oriented. Move information around and remove redundancy. Check the paths to commands and availability of commands. Make docs reflect some changes in functionality. Remove images of toobar buttons that are no longer referred to in text. Change-Id: I7f9743d35ceebfc0f7097a1af2e12eeb344c8e58 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 11 Apr, 2013 - 2 commits
-
-
Leena Miettinen authored
In the Qt Linguist Manual. Change-Id: I4ec995afa821d786535a140730187058665e029c Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Leena Miettinen authored
To the Qt Linguist Manual. Change-Id: I55b3ccb8fe04b6997c3ce953de6544a193b3548e Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 10 Apr, 2013 - 1 commit
-
-
Leena Miettinen authored
Move the description of the release process from the Developer chapter to the Release Manager chapter. Change-Id: Ia119e57b090d10d23b875120b1394be1c89b8405 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 27 Mar, 2013 - 1 commit
-
-
Stephen Kelly authored
The generation relied on the uitools module for the version, so if it was not available, we got errors like this: WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfig.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsConfigVersion.cmake' WARNING: Cannot open substitute for output '/cmake/Qt5LinguistTools/Qt5LinguistToolsMacros.cmake' http://testresults.qt-project.org/ci/QtTools_stable_Integration/build_00128/linux-g++_no-widgets_Ubuntu_12.04_x64/log.txt.gz Use MODULE_VERSION for the version instead and MODULE_BASE_OUTDIR for the generation location. Change-Id: I9daa6878553015e841b6e41fd1f64eb60ada7774 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by:
Stephen Kelly <stephen.kelly@kdab.com>
-
- 25 Mar, 2013 - 1 commit
-
-
Leena Miettinen authored
Replaced "e.g." with "for example" and "etc" with "and so on". Removed contractions. Removed some extra spaces. Change-Id: Ic0b9d5df2ee7f7bb080abb002027546f0fc6da4d Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 23 Mar, 2013 - 1 commit
-
-
Leena Miettinen authored
From front page to a separate topic. Change-Id: Idc9a599e0c8f095b0d6d63fd74b43848a8b13d3d Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
- 19 Mar, 2013 - 5 commits
-
-
Oswald Buddenhagen authored
lupdate makes no sense on x-built targets at all. though one may also argue whether it makes sense to actually bootstrap it - while its use may be supported by the build system, it's typically not part of regular builds, but rather used shortly before running linguist - for which a host build of qt is necessary anyway. one argument for bootstrapping is that it uses the qmldevtools library, which logically should be bootstrapped (the only other current user is qmlmin, which definitely *is* used in regular builds and thus needs bootstrapping). Change-Id: Ia3ddd901fe2b0c2b7b77af7f1ebc66d757fc7783 Reviewed-by:
hjk <hjk121@nokiamail.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Oswald Buddenhagen authored
it's a build tool, so it should be built for the host. Change-Id: I55baee65d3e91bf5189c10f30e23975abfc4de10 Reviewed-by:
hjk <hjk121@nokiamail.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
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>
-
- 13 Mar, 2013 - 1 commit
-
-
Stephen Kelly authored
Change-Id: I8f14f79c1e8e17816d63303f130773780547346a Reviewed-by:
Alexander Neundorf <neundorf@kde.org> Reviewed-by:
Stephen Kelly <stephen.kelly@kdab.com>
-
- 12 Mar, 2013 - 3 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
there is no qt3support in qt 5 any more. Change-Id: I9da9c209095a753d45419fb34a5737cd8dde4dc4 Reviewed-by:
hjk <hjk121@nokiamail.com> Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
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 - 8 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
they are versioned nowadays Change-Id: I136d9073acd9f2c19d1b41ed1d071250c8e86048 Reviewed-by:
Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-
Oswald Buddenhagen authored
Change-Id: Ib53e90616e5dc98d6fbfdef5172eb96216a6a60e Reviewed-by:
Jerome Pasion <jerome.pasion@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>
-