summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* add write_file() functionOswald Buddenhagen2012-08-012-1/+63
| | | | | | | | follow suit with qmake ... Change-Id: I4e57e160b811b6496adf208b49f1dd0df0b57563 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add touch() functionOswald Buddenhagen2012-08-011-2/+67
| | | | | | | | follow suit with qmake ... Change-Id: I906bf83bbbb106cddd8becd85faef8e1c4c5d64f Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add mkpath() functionOswald Buddenhagen2012-08-011-1/+17
| | | | | | | | follow suit with qmake ... Change-Id: I9ad3b3a6765b5e44cb9da87401f29c838d59491d Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add log() functionOswald Buddenhagen2012-08-011-4/+13
| | | | | | | | | | | follow suit with qmake ... using fputs() instead of the fancy handler functions, as this is only for qmake, which would just print to stdout anyway. Change-Id: I0433d8157ce8c6e580b3fec6f622896b972f7b48 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't set m_sourceRoot if it equals m_buildRootOswald Buddenhagen2012-08-011-1/+2
| | | | | | Change-Id: I3e20c2a9b4455f7e9fcc60202166d1a8a079cba2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* optimization & clarification of m_skipLevel useOswald Buddenhagen2012-08-013-34/+20
| | | | | | | | | | | | as the branch evaluation in non-cumulative mode nowadays actually skips code instead of merely incrementing m_skipLevel, !m_cumulative implies !m_skipLevel. based on that we can eliminate some always true/false conditionals, and hard-wire m_skipLevel to zero if PROEVALUATOR_CUMULATIVE is not #defined. Change-Id: I19569ff96f21a5074f677b873ed800a6818f1a6b Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't print an empty line if system() produces no stderrOswald Buddenhagen2012-08-011-3/+5
| | | | | | Change-Id: I88d85c70334de2a5f913b6c67d0d253094979fd8 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make error() actually cancel execution in non-cumulative modeOswald Buddenhagen2012-08-013-3/+4
| | | | | | Change-Id: I50289cdfe906c923076a4a2dc57f7ca35c8e9b90 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* minor speedup of message()/warning()/error()Oswald Buddenhagen2012-08-011-4/+6
| | | | | | | | | properly identify the function in the dispatcher, to save an additional string comparison later. Change-Id: I6bb88bf620f5f47416d8f58cf00050913fc3aa4b Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* bring isEmpty() semantics in line with qmakeOswald Buddenhagen2012-08-011-9/+1
| | | | | | | | | qmake doesn't check if there is exactly one empty element - be it because (theoretically) there can be no empty elements. Change-Id: I603f2a472c02d270eafd1b3f6f9adae4349b3af0 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make defined() support testing definedness of variablesOswald Buddenhagen2012-08-011-2/+6
| | | | | | | | follow suit with qmake ... Change-Id: I9b8a7b64df812c4c5a5ee25eaf931629feca0689 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* slightly more elegant eof signallingOswald Buddenhagen2012-08-011-2/+2
| | | | | | | | | we don't really use the current character at this point, so don't fake it and use the cur pointer as a flag. Change-Id: I0dd31ff07fafe0748b88b3a573d25b689f0c3748 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add requires() function and REQUIRES magic variableOswald Buddenhagen2012-08-014-1/+26
| | | | | | | | follow suit with qmake ... Change-Id: I6afc3898a01cc9926b9652b7f0f66becc255f01b Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* implement if() by means of precompilationOswald Buddenhagen2012-08-015-402/+48
| | | | | | | | | the performance is about the same (depending on the expression type it's better or worse), but a lot of code just disappears. Change-Id: I60eb9b87f23cc811d3f9577841c38966ecfd8e43 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* save a memory reallocation for short-lived parse resultsOswald Buddenhagen2012-08-011-2/+3
| | | | | | | | | | | | | everything which is not stored in the parser cache is assumed to be disposed of rather soon anyway. this increases peak memory usage per evaluator by a few kilobytes (something in the order of five times the file size). as only manual spec parsing and eval() statemenents in projects use non-cached parsers, the impact is pretty much insignificant. Change-Id: I326f312f4dd98b30b692d219de7ae092b6ad3584 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't ignore parsing errors in eval() and on the command lineOswald Buddenhagen2012-08-012-10/+16
| | | | | | | | | | to optimally support cumulative mode, the parser will happily return a bytecode object even when parsing failed, so errors must be treated later. Change-Id: I1a5c0ca9bf46a93d7359f590f0dd0ddc96baba0a Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make visitProBlock() return the last condition's stateOswald Buddenhagen2012-08-012-5/+5
| | | | | | | | | | | | will need it later. eval() needs to be taught to ignore the return code, as qmake stupidly does. as a side effect, flow control statements inside eval() don't have an effect outside eval() any more, which is only sane. Change-Id: I924e9d687f693a224dd7fa73af4a9bc69247e2df Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$system_quote() & $$shell_quote() functionsOswald Buddenhagen2012-08-013-32/+61
| | | | | | | | follow suit with qmake ... Change-Id: I3db37ba73cb709d8baf200600ae29241bc26bee5 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$system_path() & $$shell_path() functionsOswald Buddenhagen2012-08-011-1/+29
| | | | | | | | follow suit with qmake ... Change-Id: I41ceb93b234eafd5202c618a7af36e35278ad79f Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$clean_path() functionOswald Buddenhagen2012-08-011-1/+9
| | | | | | | | follow suit with qmake ... Change-Id: Ic80bab44704baf8a265b0ebead6f0ec024653f73 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$absolute_path() & $$relative_path() functionsOswald Buddenhagen2012-08-011-1/+19
| | | | | | | | follow suit with qmake ... Change-Id: Idbe30c40ef86286b871d678900c963b5d9d851c4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$shadowed() functionOswald Buddenhagen2012-08-014-1/+42
| | | | | | | | follow suit with qmake ... Change-Id: Ic97576eaf74dfd58e8d8cd2f8034dac3963b92c4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$enumerate_vars() functionOswald Buddenhagen2012-08-011-2/+12
| | | | | | | | follow suit with qmake ... Change-Id: I28649e443e91c061e1452674dfc2a101b097da7f Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$prompt() functionOswald Buddenhagen2012-08-011-1/+21
| | | | | | | | | | | | | follow suit with qmake ... this doesn't use any of the fancy handler functions for printing the message, as it doesn't seem worth it: the read is done directly from stdin anyway, and everything else would be overengineered, given the purpose - this is probably the most useless qmake function ever. Change-Id: I4831bfc06ce2623c4090d13c04be286bc18f1b5d Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$val_escape() functionOswald Buddenhagen2012-08-011-1/+81
| | | | | | | | follow suit with qmake ... Change-Id: I2262b48f5989c7969a59f7d41b5a308fc5f52c29 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add $$reverse() functionOswald Buddenhagen2012-08-011-1/+12
| | | | | | | follow suit with qmake ... Change-Id: I21da3676713101df1be956946c6543f7ae388f5f Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* add $$format_number() functionOswald Buddenhagen2012-08-011-1/+72
| | | | | | | follow suit with qmake ... Change-Id: Ie51c44cb38baa32c9c519bd7fec660f4c87f78f4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* unify error messagesOswald Buddenhagen2012-08-012-23/+23
| | | | | | | | | - start with capital letter (unless it's a function name) - end with period Change-Id: I62350ca2c632cf27334fe6acad2ad0487eef74a4 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* normalize the output of $$find()Oswald Buddenhagen2012-08-013-21/+4
| | | | | | | | | follow suit with qt5 qmake. this is actually wrong for qt4 qmake, but i boldly assume that it doesn't matter. Change-Id: I7e0ced1f335fde28f56fa6c5a4a1a581ec7e9ad0 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* fix $$split()'s argument checkOswald Buddenhagen2012-08-011-1/+1
| | | | | Change-Id: I2cd6dc1ad571497f540360d17dadd5e4b300ef4a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* propagate QMAKE_INTERNAL_INCLUDED_FILES from evaluateFileInto()Oswald Buddenhagen2012-08-011-0/+7
| | | | | | | | | no matter how little we actually use from the included files, we need to record that we included them in the first place. Change-Id: If09efc78f6aff4189101b21bfa040c28cefbb579 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* add support for option(host_build)Oswald Buddenhagen2012-08-017-7/+77
| | | | | | Change-Id: I7b16d13b0f94d0a2e4b4743a40dad9bd8b8b9698 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* use QT_HOST_DATA/get to access the qmake filesOswald Buddenhagen2012-08-011-2/+2
| | | | | Change-Id: I0cdfcacb6e5e6f98914a87d8a1418f839f0c0da0 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* querying unknown properties is not an error, so don't report oneOswald Buddenhagen2012-08-011-2/+2
| | | | | | | | as far as qmake is concerned, anyway Change-Id: I3b974e495ece4f4c30b737198c74dacfda8dbd0f Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* CDB: Output std::wstring with compiler option -Zc:wchar_t-.Friedemann Kleint2012-08-011-1/+4
| | | | | | | std::wstring is then based on wchar_t instead of ushort. Change-Id: I4dd3ef29069b8375e7003deba3162537a0d01784 Reviewed-by: hjk <qthjk@ovi.com>
* implement qmake language and deprecation warningsOswald Buddenhagen2012-08-015-26/+77
| | | | | | Change-Id: Ia5dd0c408ace4e779da898ffb60e9ca12a383225 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* revamp message callbacksOswald Buddenhagen2012-08-017-35/+38
| | | | | | | | instead of having a bazillion different callbacks, have only one with a type parameter. the drain typically multiplexes all into one stream anyway. Change-Id: I963daefc5a266c91334a4cc599570ed26b603d5d Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Fixes in translated stringsRobert Loehning2012-08-012-3/+4
| | | | | Change-Id: I4b554d925102fcd7c503276c1e085e8f438b0e3c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* core: adapt to changed syntax to include help in Qt 5hjk2012-08-011-2/+6
| | | | | Change-Id: Ia821f870c16518f016c78fcf25dda30889a07122 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remotelinux: rename LinuxDeviceConfiguration to LinuxDevicehjk2012-08-0139-128/+115
| | | | | Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Fixed string typo in Android pluginSergey Belyashov2012-08-011-1/+1
| | | | | Change-Id: I95b2192e00830bc4e0a6eb18228ed706dbebd51d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Madde: Remove support for generic MeeGo.Christian Kandeler2012-08-0137-827/+46
| | | | | | | | | Platform is dead, no known users, not tested in ages (and no resources to do so). Change-Id: I6f4f913d9379010a3d4abc2728d9ab4425a32bc3 Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: hjk <qthjk@ovi.com>
* ProjectExplorer: Introduce generic application runner.Christian Kandeler2012-08-0140-1703/+1013
| | | | | | | | | | This class aims to be a flexible worker class for SSH-based run controls. It supersedes AbstractRemoteLinuxApplicationRunner as well as all of its derived classes, while having no RemoteLinux dependencies itself. Change-Id: If24f03a32126b36fc3d0b253a1615ad0af5f2b46 Reviewed-by: hjk <qthjk@ovi.com>
* Context cleanupOrgad Shaneh2012-08-015-11/+1
| | | | | Change-Id: I5e228acda32e8924d6a9bed13ea34182fff1dbb1 Reviewed-by: hjk <qthjk@ovi.com>
* cmake: remove TODO on cmake mime typehjk2012-08-011-1/+1
| | | | | | | | There seems to be no officially registered mime type for cmake, so text/x-cmake is arguably "correct". Change-Id: Ic1ddcd356fcf9f2f8d814b9f9ce32a96b78afeb2 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* QmlJS: Fix parser generation scripts to adjust export of QmlDirParser.Christian Kamm2012-08-012-2/+4
| | | | | Change-Id: I721d8ce4fdd4ca09bf2ee68a8e54aa7351664e3a Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
* Fixed typoRobert Loehning2012-07-311-1/+1
| | | | | Change-Id: Ica017fd6aab99ca5b8add0313e3c6836fd945c2b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Using numerous formRobert Loehning2012-07-311-2/+2
| | | | | Change-Id: I6664790e0aa50abdf9c2adb224168065ce57cb8c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Git: Rename 'Undo uncommitted repository changes' to 'Reset...'.Friedemann Kleint2012-07-312-4/+4
| | | | | | | | | 'Reset' is in sync with the command line option and more appropriate to the functionality after the introduction of the history dialog. Change-Id: I2328c7137089a5f372b59b4db7074753a16ecbdf Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* debugger: move startgdbserverdialog from remotelinux pluginshjk2012-07-3114-141/+102
| | | | | Change-Id: Ic382437bb99fe1b6bda9b1252e286cb3b9476191 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
View Lorry Controller Status