Commit Graph

22748 Commits

Author SHA1 Message Date
Christian Stenger
f64a31a09d Squish: Changed fatal to warning
We still have a fallback and jenkins will
mark this as a problem (while it ignores warnings).

Change-Id: Ie33085c844c7ffbe1985a6b867aef00c7ae8c920
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-23 11:59:41 +01:00
Christian Stenger
14a8ad256e Squish: Make QMLViewer test stable on Jenkins
Change-Id: I175d10e1a5c23616801ac2c9be298198c89541b2
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-23 11:58:21 +01:00
Leandro Melo
466ea4842c C++: Improve file accuracy when finding symbols
This patch introduces a priority-based mechanism when searching for certains
symbols in the snapshot. The priority corresponds to how similar the file path
from the "reference" symbol is to the file path from the "candidate" symbol.
This solves a variety of issues when matching "equivalent" symbols but that
are in another file/project, such as when following a function declaration,
a forward class declaration, or adding a definition through a quickfix.

There's now a symbol finder which will compute the "best" search order and cache
the most recent results. A consequence is that following symbols in some cases
is slower, but not apparently significatly.

Note: The "find" functions were moved from the Snapshot to the new SymbolFinder
class.

Task-number: QTCREATORBUG-6697
Task-number: QTCREATORBUG-6792

Change-Id: Ia518f014275fec1f4d0cb3224bd4e06a9df6d557
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-01-23 11:34:44 +01:00
Nikolai Kosjar
271ec63a10 Deploy steps: Get rid of useless aggregation.
Change-Id: I03a3d020336dab4d2f1f85c77138d8df6246c174
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-01-23 11:21:09 +01:00
Orgad Shaneh
aee8a3ac88 debugger: fix copy-and-pasteo
Change-Id: I99923f9c2a06e8ef3bdb070419b4a19af0ddfa90
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-23 10:23:58 +01:00
hjk
406430fa1e debugger: compile fix in lldb support
Change-Id: I5bb5aae496cc1d8b53bf4911d651a10ab52ca924
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 18:12:00 +01:00
Christiaan Janssen
2163f789b1 QmlProfiler: rewriting details for bindings
Change-Id: Ie180ecc8d336bca1713edd5eb5fff0681c641b9d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-20 17:06:23 +01:00
Daniel Teske
4e9192fc10 Fix some strings to the Ui guidelines
Change-Id: I114a30b2278e375cde27fd4be3e8f6791c387400
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-20 16:28:37 +01:00
Kai Koehne
f7c9b4eeb2 Debugger: Add simple app to test mixed QML/CPP debugging (QQuick1)
Change-Id: I7b7983a795c3c72e611bd6531c84cf498fb15c9f
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 16:18:01 +01:00
Christian Kandeler
8287cbe1fa SSH: Use enum for signals API.
There is no reason to bother the user with the protocol-internal
strings.

Change-Id: I7ebec9147b2d00cfdc779920d9ceb18e26c59755
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 16:01:29 +01:00
Friedemann Kleint
f5aa8d4658 Locator: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: I7b4b5e25aba9f2de9cbfde0f4553685cd4e01346
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-20 16:01:11 +01:00
Friedemann Kleint
fa20c2a95e Find: Compile with QT_NO_CAST_FROM_ASCII.
- Add missing tr()
- Fix potential crash constructing QString(0).

Change-Id: Ie35c047800a60410ca0886f8e50be1670c8375e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-20 15:35:19 +01:00
Bojan Petrovic
a138465848 C++: Select All select the symbol while renaming symbol
https://bugreports.qt.nokia.com//browse/QTCREATORBUG-5520

Change-Id: Ifb163adb2609e17cdbc3df1e90b7e583c75fac49
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-20 15:27:09 +01:00
Friedemann Kleint
d96c1a746e Designer: Compile with QT_NO_CAST_FROM_ASCII.
Change-Id: If9c8c58f1b86fe8b32f24240bd256b5bb8790c6c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-20 15:20:20 +01:00
Christian Stenger
26796f6024 Squish: Try to make this run on Jenkins
I'm not sure for this - but LD_LIBRARY_PATH is always empty for
me. But inside Jenkins it's set and could mess up the hook into
sub application.

Change-Id: I2f3283f67d60a94083a5eb589abed01b05e66b29
Reviewed-by: Bill King <bill.king@nokia.com>
2012-01-20 14:41:10 +01:00
hjk
c828c363b1 debugger: new dumpers for boost::posix_time::{ptime,time_duration}
Task-number: QTCREATORBUG-6834
Change-Id: I494868dd4e8819284dbc7439cff89ffe07f6a958
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 14:38:05 +01:00
Christian Kandeler
b46cdd3729 SSH: Adapt test to an earlier change.
Change-Id: I67504abe9b32443667497c29fb27b555cf5419fc
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-01-20 13:58:55 +01:00
Christiaan Janssen
1958fd82d5 QmlProfiler: reading column information in bindings
Change-Id: I1a99c3508de733d98eb99f41419eccfdca030fe0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-20 12:18:50 +01:00
Tobias Hunger
4894c559ac VCS: Fix warning about hiding a virtual method
Change-Id: I8f314486a50f9b7015572615d2306d5c7e2f1670
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-01-20 11:59:43 +01:00
hjk
8e3b9d38e8 debugger: do not disable updates on locals and expressions
Task-number: QTCREATORBUG-5474
Change-Id: I6a2e872ac64a6ae57ff1ee9618937f0752fbb4ed
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-20 11:22:46 +01:00
Hugues Delorme
b6a06105c5 VcsBase: URL and email support in log editors
URL and email addresses are recognized in log and annotate
editors so the user can interact with as it is usually done
with VCS change identifiers.
The design of "text cursor handlers" opens the path for
further support of other contents like bug id of the
form "QTCREATORBUG-XXXX".

Change-Id: I88f553cf8ac90678ace52144ba0b43604279a234
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-20 09:36:39 +01:00
Oliver Wolff
a936318830 Export AbstractMsvcToolchain in order to use findInstalledJom in other toolchains
Change-Id: I8af36be42a8c129f1f3b19ea1b30b12497c0cdc7
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-20 09:30:47 +01:00
Aurindam Jana
b63a2b3f62 Profiler: Print recording status correctly
Change-Id: I3120e1485cd81beb48d7a2cc1f6395708cb0e722
Reviewed-by: Erik Verbruggen <erik.verbruggen@nokia.com>
2012-01-20 09:22:06 +01:00
Tobias Hunger
7ad7886b07 TC: Use FileName for debuggerCommand()
Change-Id: Ifa168b95d290bfae5c342981c4e4556d6f6913eb
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-19 15:34:46 +01:00
hjk
fa26b986de debugger: fix recent regression of non-persistent expanded watch items
Change-Id: Iec8b37812faca5584d268712181ffeca98ef6e8a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:20:28 +01:00
Kai Koehne
c06727ca17 Debugger: Fix runtime warning if QmlJsInspector plugin is not loaded
Change-Id: I9c8132b4af2d1664622e4574e0c442a96b88c778
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:03:24 +01:00
Kai Koehne
2ec1f1d970 DebuggerEngine: Avoid warning when aborting in EngineShutdownRequested state
Change-Id: Ib0e0a2bbf0fa7d109a3910d0814ec9edef130dc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:03:02 +01:00
Kai Koehne
6bb77534c0 QmlCppEngine: Fix warnings about invalid state changes
Change-Id: Iaa45ff106f5f71a2c7f4729c64c281921b855f80
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 15:02:34 +01:00
Kai Koehne
75a9d6961c DebuggerEngine: Avoid warning when aborting in EngineSetupRequested state
This can happen e.g. inside the QmlEngine as part of a QmlCppEngine.

Change-Id: Id649086b3febe91e73d4784f3abb7f6d7a0d0d50
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-19 14:59:30 +01:00
Erik Verbruggen
ea27d72d19 Fix crash when doing "Move into file" refacoring action.
Change-Id: I0b42953b7bce6b594387777691aca4c2683a5828
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-19 13:59:46 +01:00
Daniel Teske
6efd36a790 Add missing update Actions
Change-Id: I23765629a2c95c65f3ff3dc5c948d3386aeb962e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-19 12:40:51 +01:00
Leena Miettinen
a0adceb809 Doc: link to KDE-Files.org
Task-number: QTCREATORBUG-6793

Change-Id: I783bd97445620f3795c8b7378aee8ca4557e0dda
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-01-19 10:37:12 +01:00
Leena Miettinen
d465f2e363 Doc: use macro for Qt Simulator product name
Change-Id: I68b7d4d2d8a6ef62f3b09aaf114b1cde94cda63b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-19 09:39:41 +01:00
Aurindam Jana
79f7e6edfa ScriptConsole: Keep History
Keep History when view port is cleared.

Change-Id: I6b2d3bdb2b7bbb78cbcb891820a355ba6b074e6f
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 15:53:57 +01:00
Daniel Molkentin
ab079b86cf Add platform names and versions
Also introduce $INSTALL_EDITION env var which acts as infix.
(possible values: opensource, commercial, etc)

Change-Id: I86f58444b21853ae4bcb8509e491610c76c414da
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-18 15:53:50 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
hjk
31d5ec9cab debugger: enable forceful abort of mixed qml/cpp engine
Change-Id: I815f0bf91e8ca58c9e472f81a234834dc341f29d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 15:00:00 +01:00
Aurindam Jana
70bcccd646 ScriptConsole: Show current context
Show the current context in the script console. The expression
in the script console is evaluated within this context.

Change-Id: Ieb4cfc3e0892b150301f4ad79220cd878dee3ce3
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 14:57:41 +01:00
Aurindam Jana
8e7a11392c ScriptConsole: Output of expression
Show the output of console.log correctly when
evaluated in the script console.

Change-Id: I7ca3393f0db21cb02b8546c17c4c8756d907b8ec
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-18 14:53:03 +01:00
Leena Miettinen
ab46da7302 Doc: add numbers for creating screenshots
The numbers can be used to highlight parts of screenshots.

Change-Id: I99ba5b16ee284c6647aab214edec18c3d665bf87
Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
2012-01-18 14:41:27 +01:00
Leena Miettinen
61e1700f93 Doc: use variable for product name
Change-Id: I17a720f2bd9732f607d104ae6645e6f8eb64fb61
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-18 14:38:28 +01:00
Leena Miettinen
c68b83cb47 Doc: fix field name in doc
Change-Id: I281a8a8b3dbe375dfb0905e4d033a52b0e2ef473
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-18 14:37:32 +01:00
David Schulz
354b51fda0 Set focus to the editor after selection change in outline
now also if the selection is changed in qmljsoutline

Task-number: QTCREATORBUG-6306
Change-Id: I07365de90cc932bcc5d0ccf021b3dd7daf3bc17a
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-01-18 14:30:42 +01:00
Eike Ziller
e583422cbf Still start up in welcome tab initially and if it was the previous tab
Amendment to fe068869b9

Task-Number: QTCREATORBUG-6803
Change-Id: Ibf93ff87fc535133b87d8fdc51c2bce4da77ab76
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 12:12:38 +01:00
Eike Ziller
841d5a9939 Fix FileName::appendPath (and through that Qt abi detection on Mac)
appendPath was actually not ensuring a '/' between the parts, contrary
to what it claimed.

Change-Id: I80b703160fc05c099db9b461366c91a55525038b
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-01-18 11:02:45 +01:00
Eike Ziller
075c598f92 Mac: Explicitly set architecture to selected tool chain.
The tool chain selection in build configurations had no effect on the
actual build, which is especially visible on Mac with universally built
Qt. The patch passes the tool chain's architecture (+bit width)
explicitly to Qmake. Users can override this behavior as usual by adding
or removing architecture flags from CONFIG in the additional arguments
field.

Task-number: QTCREATORBUG-6088
Change-Id: I92fdb7d5650db6e681945fa82e86422917f84035
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-01-18 09:45:31 +01:00
David Schulz
c80ec5513c fix for locator using up and down keys under mac
Fixes the issue that you cannot switch elements by the up- and downkey in the locator under mac.

Task-number: QTCREATORBUG-6826
Change-Id: I452bb487608fad3b32c845036939f02e9cf4b3b6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-18 09:39:16 +01:00
Daniel Teske
2ac162dd2f Coding style: wrongly indented line
Change-Id: Id8293537f7e608065862483fdbf7f425c09f5fe6
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 19:47:16 +01:00
Daniel Teske
22c43a59ef Remove dead code
Change-Id: I31159768dc7ff1b4634f210833874b8f141ee4cd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-17 19:47:01 +01:00
hjk
334b7cb426 debugger: don't allow L&E expansion while inferior runs
Change-Id: I1179f2b3b0f1e0099e5ab2a30b09e1216cd68fd7
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-17 18:52:40 +01:00