summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix gcc warning about unused codeKai Koehne2013-05-221-0/+4
| | | | | Change-Id: I88bef60bb272319229a92481deec4ac9de9a0547 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Qt Designer: Fix help URL to point to qdesigner-manual.html.Friedemann Kleint2013-05-211-1/+1
| | | | | Change-Id: I59a14c7f2a2c770b4b67a2af5c4d5542519f0d63 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* make stubs for dangerous/useless qmake functions in limited modeOswald Buddenhagen2013-05-211-8/+20
| | | | | | | | | | | | | | | | 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>
* don't send output of $$join() and $$sprintf() through split_value_list()Oswald Buddenhagen2013-05-211-3/+2
| | | | | | | | | | 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)
* clean paths of found files in prepareProject()Oswald Buddenhagen2013-05-211-3/+3
| | | | | | | | | 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)
* make split_value_list() mostly saneOswald Buddenhagen2013-05-211-31/+38
| | | | | | | | | | | | | 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)
* permit returning from filesOswald Buddenhagen2013-05-211-12/+17
| | | | | | | | | | 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)
* remove pointless initialization of qmakespecOswald Buddenhagen2013-05-211-1/+0
| | | | | | | | 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)
* Update feature paths on assignment to QMAKE_PLATFORMTor Arne Vestbø2013-05-212-1/+4
| | | | | | | | | | | | | 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>
* remove automatic splitting from $$() expansionsOswald Buddenhagen2013-05-211-3/+3
| | | | | | | | | | | | | | | | | | | | | | $$(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)
* don't pretend that break()/next()/return() are functionsOswald Buddenhagen2013-05-216-37/+77
| | | | | | | | | | | | | | | | 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>
* improve parse error recovery pathsOswald Buddenhagen2013-05-211-4/+7
| | | | | | | | | | | | 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>
* Android: Fix for compilation error in clucene.v5.1.0-beta1Christian Strømme2013-05-072-1/+5
| | | | | | | | | Android only provide stubs for wcstoll(3) and wctomb(3), to solve this wcstoll(3) is replace by an internal equvialent, and wctomb(3) by wcrtomb(3). Change-Id: Ic30e5a809c2f6ab30b4e52883d3aae3ecc036194 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-0317-94/+32
| | | | | Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* adjust to new "configure -nomake tools" semanticsOswald Buddenhagen2013-05-034-0/+24
| | | | | Change-Id: I953ce0215e67ee4dd8fa4fc0db2c1903946e3132 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pointless INCLUDEPATHsOswald Buddenhagen2013-05-031-3/+0
| | | | | Change-Id: I8e8bfd391ef8b243e288094f5a02544efe1b2f49 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* parallelize SUBDIRSOswald Buddenhagen2013-05-035-5/+11
| | | | | | Change-Id: Ie1c6e8e479c8f2e758b03175d9250a71e52ce3ce Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* remove pointless mac scopeOswald Buddenhagen2013-05-031-5/+0
| | | | | | | | | this subdir is only entered on mac. also, if this scope was actually skipped, the result would be rather unexpected ... Change-Id: Ie46b0bfcac081ff55b737c444d15ff6afaf1507b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove pretenses of building kmap2qmapOswald Buddenhagen2013-05-031-2/+0
| | | | | | | | the 'embedded' scope (qws) is dead. Change-Id: I4942d90eac9583787610ed3217145240fa89693f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Improve warning message about code being auto-generatedAxel Waggershauser2013-04-222-1/+4
| | | | | Change-Id: I9b5460ed09ed458f86e4ea3001f73e482ef97765 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix trailing whitespace issue in ui4.cpp generating xslAxel Waggershauser2013-04-221-1/+1
| | | | | | | | Fix the line responsible for generating the trailing whitespace in the qtbase/src/tools/uic/ui4.cpp file. Change-Id: I446ce360c5064dc6a88b7b472790e9672cc6b30a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove pretenses of building makeqpf automaticallyOswald Buddenhagen2013-04-221-3/+0
| | | | | | | | | | | the 'embedded' scope (qws) is dead. makeqpf is a graphical host tool to be used in the process of deploying embedded software. as the qt build system does not support such a configuration, the tool simply must be built manually. Change-Id: I6aeafb758e6e55ec228b535ef7354d4c78745e80 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Update README: it's not 2008 anymorePaul Olav Tvete2013-04-221-1/+2
| | | | | Change-Id: I4f4e1273216df9aadc9af789cdcda3127f0ccc3a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make linguist's source viewer read all files as UTF-8.Mitch Curtis2013-04-171-1/+1
| | | | | | | | | | | | | | | It currently loads source files as latin1, which means unicode characters are not supported. 4944ea0586 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>
* Doc: remove help output from the Qt Linguist ManualLeena Miettinen2013-04-162-97/+2
| | | | | | | | | 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>
* Doc: describe translation sources in Developer topicLeena Miettinen2013-04-161-34/+74
| | | | | | | | 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>
* Doc: remove details about i18n from Qt Linguist ManualLeena Miettinen2013-04-152-308/+47
| | | | | | | | Add links to topics that describe i18n in detail for C++ and QML. Change-Id: I47b95b040dd9efe4eb8951dedbf94ab8988316e5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: rewrite Translators topic in Qt Linguist ManualLeena Miettinen2013-04-1229-733/+351
| | | | | | | | | | | 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>
* Doc: replace "balloon help" with "tooltips"Leena Miettinen2013-04-111-1/+1
| | | | | | | In the Qt Linguist Manual. Change-Id: I4ec995afa821d786535a140730187058665e029c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: add link to Internationalization with QtLeena Miettinen2013-04-111-0/+3
| | | | | | | To the Qt Linguist Manual. Change-Id: I55b3ccb8fe04b6997c3ce953de6544a193b3548e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix plugin export macros in Qt Designer documentation.Friedemann Kleint2013-04-101-3/+2
| | | | | | | | | Use Q_PLUGIN_METADATA instead of Q_EXPORT_PLUGIN2 . Task-number: QTBUG-30508 Change-Id: Iedc1e140d3f597e29911a38e5d5548e6ac9981b3 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: move release management task list in Qt Linguist ManualLeena Miettinen2013-04-101-26/+27
| | | | | | | | 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>
* QUiLoader/Designer: Fix gcc 4.8 warnings about unused typedefs.Friedemann Kleint2013-04-062-4/+0
| | | | | Change-Id: I792f3060c808ef860b31b47b3b00e5ac1991eedd Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-04-031-1/+1
|\ | | | | | | | | | | | | Conflicts: src/assistant/assistant/assistant.pro Change-Id: I7ca59c8150a591c7e2ba57fd729421b4dba064d0
| * Assistant: Fix static linking on Windows.v5.0.2Friedemann Kleint2013-03-271-1/+1
| | | | | | | | | | | | | | | | | | Check for existence of sqlite-plugin. Breakage introduced by d73afeeafc7df8192508c1a5617944d303d5a0a2 . Change-Id: I2595ed4d80e0804f1c2503cddf94ca15e4922af9 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| * Assistant: Fix static linking for Linux.Friedemann Kleint2013-03-262-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | main.cpp:78: undefined reference to `qt_static_plugin_qsqlite()' The import for the DB plugin should now be generated by qmake. Change-Id: I9da25aea8667ca34221427236b8e1d36be77da8b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com> (cherry picked from commit f212e46fe930ee89a8cb52beeeccc03369c015a1) Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Generate the Qt5LinguistConfig.cmake files independent of QtUiTools.Stephen Kelly2013-03-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Doc: edit Qt Linguist Manual for styleLeena Miettinen2013-03-251-17/+21
| | | | | | | | | | | | | | | | 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>
* | Doc: move Qt Linguist overview informationLeena Miettinen2013-03-231-14/+23
| | | | | | | | | | | | | | From front page to a separate topic. Change-Id: Idc9a599e0c8f095b0d6d63fd74b43848a8b13d3d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge branch 'dev' into stableSergio Ahumada2013-03-2092-791/+177
|\ \ | | | | | | | | | | | | | | | This starts Qt 5.1 release cycle Change-Id: I359d5bfaa62a4d37a2deec79f80963ae5c19d918
| * | make lupdate a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | make lconvert a host toolOswald Buddenhagen2013-03-192-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | make lrelease only optionally bootstrappedOswald Buddenhagen2013-03-192-2/+2
| | | | | | | | | | | | | | | | | | | | | qt_tool.prf handles the magic for us. Change-Id: Ifb8e7fd7ff0e46b9b274c9d156e048e89586ab2c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| * | fix translation contextsOswald Buddenhagen2013-03-198-28/+10
| | | | | | | | | | | | | | | | | | | | | | | | the bootstrapped library now fakes the translation api sufficiently well to enable unifying the usage. Change-Id: I6a5d7cb1bb67830f1ea0a732566ebee354d62e7e Reviewed-by: hjk <hjk121@nokiamail.com>
| * | support only utf-8 and utf-16 for source codeOswald Buddenhagen2013-03-195-27/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-03-143-2/+5
| |\ \ | | | | | | | | | | | | Change-Id: Ic32eb7c209f299f8a677fd7f247d4800eaafa879
| * | | purge CODECFORTR & -codecfortr supportOswald Buddenhagen2013-03-1218-342/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | purge ui3 support from lupdateOswald Buddenhagen2013-03-123-27/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | purge TS 1.1 supportOswald Buddenhagen2013-03-121-102/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Aero-Style-QWizard: Remove special handling in Qt Designer.Friedemann Kleint2013-03-111-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The wizard now behaves nicely when used as a child widget. Task-number: QTBUG-29904 Change-Id: I2e9705eb4197b3411c9e072d0d5c05a97df8d47f Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
View Lorry Controller Status