Commit Graph

25792 Commits

Author SHA1 Message Date
Oswald Buddenhagen
9d5ff668ef add requires() function and REQUIRES magic variable
follow suit with qmake ...

Change-Id: I6afc3898a01cc9926b9652b7f0f66becc255f01b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:45:06 +02:00
Oswald Buddenhagen
e739841c63 implement if() by means of precompilation
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>
2012-08-01 16:44:55 +02:00
Oswald Buddenhagen
75cc8575b4 save a memory reallocation for short-lived parse results
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>
2012-08-01 16:44:36 +02:00
Oswald Buddenhagen
bb063b35f4 don't ignore parsing errors in eval() and on the command line
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>
2012-08-01 16:44:25 +02:00
Oswald Buddenhagen
160e608f5a make visitProBlock() return the last condition's state
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>
2012-08-01 16:44:13 +02:00
Oswald Buddenhagen
3d629b1a2b add $$system_quote() & $$shell_quote() functions
follow suit with qmake ...

Change-Id: I3db37ba73cb709d8baf200600ae29241bc26bee5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:43:57 +02:00
Oswald Buddenhagen
3522a3e050 add $$system_path() & $$shell_path() functions
follow suit with qmake ...

Change-Id: I41ceb93b234eafd5202c618a7af36e35278ad79f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:43:27 +02:00
Oswald Buddenhagen
6c9c086632 add $$clean_path() function
follow suit with qmake ...

Change-Id: Ic80bab44704baf8a265b0ebead6f0ec024653f73
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:43:04 +02:00
Oswald Buddenhagen
58a431fac9 add $$absolute_path() & $$relative_path() functions
follow suit with qmake ...

Change-Id: Idbe30c40ef86286b871d678900c963b5d9d851c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:42:50 +02:00
Oswald Buddenhagen
187751f967 add $$shadowed() function
follow suit with qmake ...

Change-Id: Ic97576eaf74dfd58e8d8cd2f8034dac3963b92c4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:42:39 +02:00
Oswald Buddenhagen
b475ae43de add $$enumerate_vars() function
follow suit with qmake ...

Change-Id: I28649e443e91c061e1452674dfc2a101b097da7f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:42:19 +02:00
Oswald Buddenhagen
f1d7836ec0 add $$prompt() function
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>
2012-08-01 16:42:10 +02:00
Oswald Buddenhagen
115b898d8c add $$val_escape() function
follow suit with qmake ...

Change-Id: I2262b48f5989c7969a59f7d41b5a308fc5f52c29
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:41:55 +02:00
Oswald Buddenhagen
24feed1bb4 add $$reverse() function
follow suit with qmake ...

Change-Id: I21da3676713101df1be956946c6543f7ae388f5f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:41:25 +02:00
Oswald Buddenhagen
dc3ed21141 add $$format_number() function
follow suit with qmake ...

Change-Id: Ie51c44cb38baa32c9c519bd7fec660f4c87f78f4
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:41:19 +02:00
Oswald Buddenhagen
40ec38735e unify error messages
- 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>
2012-08-01 16:41:05 +02:00
Oswald Buddenhagen
397cfb700b normalize the output of $$find()
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>
2012-08-01 16:40:17 +02:00
Oswald Buddenhagen
780c0eac10 fix $$split()'s argument check
Change-Id: I2cd6dc1ad571497f540360d17dadd5e4b300ef4a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:40:01 +02:00
Oswald Buddenhagen
e781031b1e propagate QMAKE_INTERNAL_INCLUDED_FILES from evaluateFileInto()
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>
2012-08-01 16:39:30 +02:00
Oswald Buddenhagen
7c10134437 add support for option(host_build)
Change-Id: I7b16d13b0f94d0a2e4b4743a40dad9bd8b8b9698
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:38:09 +02:00
Oswald Buddenhagen
3f7fdd192c use QT_HOST_DATA/get to access the qmake files
Change-Id: I0cdfcacb6e5e6f98914a87d8a1418f839f0c0da0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:37:47 +02:00
Oswald Buddenhagen
ff276840de querying unknown properties is not an error, so don't report one
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>
2012-08-01 16:37:38 +02:00
Oswald Buddenhagen
c6d640d3cd allow override of qmake executable in testreader
that way even a testreader built against qt 4 can use qt 5 qmake.

Change-Id: I55636dc22bd13cd7dcdff7381e4f0162592bb781
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-01 16:37:26 +02:00
Friedemann Kleint
467a08127d CDB: Output std::wstring with compiler option -Zc:wchar_t-.
std::wstring is then based on wchar_t instead of ushort.

Change-Id: I4dd3ef29069b8375e7003deba3162537a0d01784
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 16:35:13 +02:00
Lukas Holecek
7e7460ad33 fakevim: Added support for smartcase searching
Change-Id: I85a83aff0886282a6eac2dc9cc4662087c3b0b95
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 16:17:03 +02:00
Oswald Buddenhagen
a93e24fd0d implement qmake language and deprecation warnings
Change-Id: Ia5dd0c408ace4e779da898ffb60e9ca12a383225
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 16:09:49 +02:00
Oswald Buddenhagen
0af96c128a revamp message callbacks
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>
2012-08-01 16:09:33 +02:00
Robert Loehning
7dd051ecce Fixes in translated strings
Change-Id: I4b554d925102fcd7c503276c1e085e8f438b0e3c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-01 16:06:40 +02:00
hjk
b9c7456486 core: adapt to changed syntax to include help in Qt 5
Change-Id: Ia821f870c16518f016c78fcf25dda30889a07122
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 15:24:50 +02:00
Lukas Holecek
6544ed2f00 fakevim: Emulate Vim regexp more precisely
Change-Id: Ia951f6e10d0e8d19e8d7d4b2a696eb9277ce6201
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 14:52:52 +02:00
hjk
6460254931 remotelinux: rename LinuxDeviceConfiguration to LinuxDevice
Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-01 14:26:28 +02:00
Sergey Belyashov
c80af2a40c Fixed string typo in Android plugin
Change-Id: I95b2192e00830bc4e0a6eb18228ed706dbebd51d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-01 14:14:17 +02:00
Christian Kandeler
7d44ffed51 Madde: Remove support for generic MeeGo.
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>
2012-08-01 13:50:56 +02:00
Lukas Holecek
d0dcd40635 fakevim: Implement special clipboard buffers
Introduces Vim's special registers "+ and "* and partial support for
"clipboard" option - only values "unnamed" and "unnamedplus" and the
behaviour is only similar.

Task-number: QTCREATORBUG-6342
Change-Id: I1fa95b681edadacfe9690a2fd6eb2e98e7cc5dca
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 13:25:04 +02:00
Christian Kandeler
1d85d8e706 ProjectExplorer: Introduce generic application runner.
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>
2012-08-01 11:55:53 +02:00
Orgad Shaneh
93756975e1 Context cleanup
Change-Id: I5e228acda32e8924d6a9bed13ea34182fff1dbb1
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 10:43:15 +02:00
hjk
e982b5b3d1 cmake: remove TODO on cmake mime type
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>
2012-08-01 10:31:14 +02:00
Christian Kamm
cf2540c9a4 QmlJS: Fix parser generation scripts to adjust export of QmlDirParser.
Change-Id: I721d8ce4fdd4ca09bf2ee68a8e54aa7351664e3a
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
2012-08-01 07:51:10 +02:00
Orgad Shaneh
e2a50ef71d Dumper: Always respect Use Dynamic Type option
Task-number: QTCREATORBUG-7504

Change-Id: Ifdc3f541eb67c36ea0cb5e61a7e5954c39cd75c4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-31 18:17:00 +02:00
Robert Loehning
ce49d54b34 Fixed typo
Change-Id: Ica017fd6aab99ca5b8add0313e3c6836fd945c2b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-31 16:59:26 +02:00
Robert Loehning
7b9cd61e5f Using numerous form
Change-Id: I6664790e0aa50abdf9c2adb224168065ce57cb8c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-31 16:33:14 +02:00
Christian Stenger
7f962aeb6b Squish: Fix setRunInTerminal for 1-target-projects
This fix just removes the dependency to the scrollArea
that exists when there are more than 1 targets but is
missing when there's only 1 target available.

Change-Id: I02594aa5226f53ffaa5e3693b8075f5ef88c5f88
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-07-31 15:36:23 +02:00
Leena Miettinen
d0f0635731 Doc: Gerrit plugin
Change-Id: I771bd1fc49483569b1289d837fc7f2399f0bfed8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-31 15:01:49 +02:00
Friedemann Kleint
a1b696c718 Git: Rename 'Undo uncommitted repository changes' to 'Reset...'.
'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>
2012-07-31 15:01:37 +02:00
hjk
1283233f4b debugger: move startgdbserverdialog from remotelinux plugins
Change-Id: Ic382437bb99fe1b6bda9b1252e286cb3b9476191
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-31 14:33:03 +02:00
Robert Loehning
59187d18d5 Fixed typo
Change-Id: Ice0c7a36e806aae53351c276afa3a14aac433d05
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-07-31 13:56:46 +02:00
hjk
88d413e03b remotelinux/projectexplorer: move UsedPortsGatherer to projectexplorer
Change-Id: Iafd7f109de3076375e667aff0c429405cef07b55
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-31 13:40:03 +02:00
hjk
bc1f091698 valgrind: use common data from RunConfiguration base class
Only display name for now.

Change-Id: I6f404e175c0eca82b39055283b4432d9eae10709
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-31 12:17:12 +02:00
Robert Loehning
73bcfdc9ce Added missing parenthese
Change-Id: Ib4ec95cc013ebe5c7086718abf72bda1d39329bb
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-31 11:45:50 +02:00
Christian Kamm
a14ed0793c QmlJS: Update to latest QmlJS parser from Qt 5.
Using qtdeclarative revision c9b7582a2e7ad9fcd03dd999c3b7a16b72803238

Change-Id: I9c942fa04c3fab5ef57b38e13471d0a4e2e8a2bf
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-07-31 11:05:03 +02:00