Commit Graph

31594 Commits

Author SHA1 Message Date
El Mehdi Fekari
196d8ddb55 Qnx: Activate/Deactivate auto detected configurations
Add activate and deactivate actions to only create kits
for used NDK targets and not for all installed ones.

Users may want to switch between different targets
without uninstalling non active taregts.

Change-Id: Ie023ebdedbf3494bb7f1c251ce5f7fadec9f9206
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 10:22:04 +02:00
David Kaspar
3c94b88cef Qnx: polishing bar-descriptor.xml files in Qt5 wizard templates
Change-Id: Ib943bdbfd6ebc7c9dfcbe5fd4995df86a3b73ff7
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 08:41:24 +02:00
Erik Verbruggen
87a3aac18f C++: add fallback project part querying
When a file is not part of any other project part, this project part can
be used to get at least some compiler flags, defines, etc. to use. This
can happen when either a file outside a project is opened, or when the
project description is incomplete.

Change-Id: I5d595fae7195e8b61dbad14368b6cae9eb15c21b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-10 07:36:25 +02:00
Andre Hartmann
fbf64eae72 AnsiEscapeCodeHandler: Fix build again
Task-number: QTCREATORBUG-10133

Change-Id: I4b12568b8ca85d55a179c4f42b6adae1d97dc2a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 22:39:14 +02:00
Petar Perisin
7a24da8a51 Clear formatting if there is no number
Task-number: QTCREATORBUG-10132
Change-Id: Ib0f6deac4d66273a1a2cc59d397134588fbd3032
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 22:26:05 +02:00
Daniel Teske
967cebcef2 Qt4ProjectManager: Skip files that are actually directories
Since the cumulative parsing now parses for loops, we get bogus data
in creator's own .pro files.

Task-number: QTCREATORBUG-10045
Change-Id: I627772f221cc5c928458788feb036cdd93b25a08
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-09 19:12:44 +02:00
Orgad Shaneh
3a23264e05 Fix MSVC build
\e is not recognized by MSVC.
See http://msdn.microsoft.com/en-us/library/6aw8xdf2.aspx

Change-Id: I2c36d9e9a613a24895dd33e37a82c0ce3d846f3d
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-09-09 18:18:00 +02:00
El Mehdi Fekari
c10682626e Qnx: Skip debug token for internal unsecure devices
Do not require debug token for devices
with internal unsecure development image.

Change-Id: I9c222492c63a7c92c253424ccb3f7c823223c95b
Reviewed-by: Thomas Zander <zander@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-09 17:53:27 +02:00
Orgad Shaneh
bdf89d1cbd Build valgrind-fake on Windows
Change-Id: If6252f9a252e9bb0626ec60bdf34fa82cda09bfa
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-09 17:41:27 +02:00
Christian Kandeler
afbf8bd2f7 QbsProjectManager: Remove unneeded include statements.
These headers are not public anyway and must not be used outside of qbs.

Change-Id: I037b6d98bdd46e69b7337cf47f9328477b2d3351
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-09 16:35:11 +02:00
jkobus
17e2847f7e Add lacking qrc files into the project
Task-number: QTCREATORBUG-9610

Change-Id: I3f98ce154e05f419ea8a3c45a18eb9df51b5cfa2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-09 16:03:24 +02:00
Nikolai Kosjar
5fcdb73e4d Valgrind: Do not ignore/overwrite tool options
...otherwise all the options the user has set are in vain.

Change-Id: I6f344aafa848e3216a8ebf98e6fdddac26af4749
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:55:21 +02:00
Nikolai Kosjar
fc86c43fd6 Valgrind: Projects: Use global settings per default
...in order to avoid "huch, it shows custom settings, but I haven't
customized anything?!".

Change-Id: I80475340202b54acbf7fbb0fe709b1e9f1cf58da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:54:38 +02:00
Nikolai Kosjar
f6a45a438f Valgrind: Initialize custom settings with global settings
...fixes "** Error: no valgrind executable set **" for new projects.

Change-Id: I838d680d902480906fab7bec0984d45c25ec7b4b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:54:09 +02:00
Orgad Shaneh
bc7778a31d Utils: Introduce sleep function
Use it in Android plugin

Change-Id: Id3ae707d5425e99a2e5b993e1ed98dddd73809a9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 15:52:49 +02:00
Nikolai Kosjar
bbdee91bc9 CppTools: Handle erroneous statements in FindMethodDefinitionInsertPoint
...at end of file.

Change-Id: Ife8142cd9cf3c5e4be2594b7cc635e5ab7b9e946
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-09-09 15:48:59 +02:00
Erik Verbruggen
3eaf044045 C++: replace a tree by a hash
Be more environment friendly by using less trees.

Change-Id: I54d3b23d697a3b72a6a803688a8da0eddaad3e17
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-09 15:06:51 +02:00
Friedemann Kleint
b9c64a392a Fix slashes of displayed make commands.
Change-Id: Ic35966fd86c40ba0b02d48f7bf0e19ab30779c97
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-09 14:49:39 +02:00
Robert Loehning
a22e2caadf Squish: Added further sanity checks to tst_simple_analyze
Change-Id: I40adc90d4cb73ef4ba3d7c723953d272116e193a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 13:50:01 +02:00
Petar Perisin
e8f5502b78 Added color support of ANSI escape codes
in compile and application output pane. Only simple font and background
controles added.

Task-number: QTCREATORBUG-9592
Task-number: QTCREATORBUG-5956
Change-Id: Ida010ed17d34bb73ae1364a77073ff435a03a060
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-09 13:05:16 +02:00
vlaomao
7e29974e4e Debugger: Added host address overriding input to debug dialog.
Task-number: QTCREATORBUG-8503
Change-Id: I385158bef63bff3a831342f090d939e4c6d7202c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-09 12:46:40 +02:00
Christian Kandeler
698144e32e Add qbs project files for autotests.
Note: Since not all autotests are able to run from an installed location,
we need to be able to start them from the build directory, which
in turn forces us to set a destination directory for libraries and plugins,
so they will be found at run-time.

Change-Id: Idcf7e1333dfa6e9dbf745391b78c035f842ccc5a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:16:09 +02:00
Robert Loehning
fbda0ef558 Squish: Updated tst_simple_analyze after fixes
Change-Id: I2cc19737d750117780efc57e4047c48f147f08ab
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 12:15:58 +02:00
Christian Kandeler
c2ac0902ed Move some functions out of defaults.js and make them project properties.
The one that is left is the only one that's actually a function taking
real input.
This saves a number of includes.

Change-Id: I77e777bbf6ed7ed4086f9a40de4dc3dd8c91a7af
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:04:01 +02:00
Christian Kandeler
0e66ac1e54 qbs project files: Fix some dependency exports.
Change-Id: I7049fcaab77639c17c4d0e74f7d9360a80fafcaa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:03:44 +02:00
Christian Kandeler
d0633f0ac9 qbs project files: Add project property ide_source_tree.
The qmake project has this as well. Will become more useful later on.

Change-Id: I6e9b6b1d1a46ea6263a6d5fac4cb30d883a3e077
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:01:39 +02:00
Christian Kandeler
5e41e0207e Add qbs project file for valgrind-fake.
Change-Id: I14d1b0e04650ef9c717be3f5ca2d7eab1017cd77
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-09 12:00:00 +02:00
Erik Verbruggen
b4a1bd415f C++: clean-up CppCompletionAssist.
This is step 1 of 2 for merging the various provider factories into a
single class. Merging has the advantage that selecting based on editor
(content) mime-type only has to select one class, instead of re-doing
the selection for each class separately.

Change-Id: I11f815151bd4769ae6028b636793d6a80d02e202
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-09 11:59:14 +02:00
Robert Loehning
49adb78ec9 Squish: Fix tst_create_proj_wizard
Change-Id: Ie4fb69873edb8be5cfb0e82a920cb90e822f6a7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-09 11:27:31 +02:00
David Schulz
70019a85a3 Editor: Added a close all option to the deleted file dialog.
Change-Id: Ibacfc31c4cd6193e85c84f8553bae7495aea08c7
Reviewed-by: Simon Schäfer <simon.schaefer@koeln.de>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-09 11:11:24 +02:00
Michal Klocek
d5d019a31d QtSupport: Fix 'Copy Project to writable Location?' dialog handling
* fixes Keep and Open dialog option
 * does nothing if user closes the dialog window

Change-Id: I3e84621e8314450c4dca2408ae2738ebcd1b33e6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-09 10:19:16 +02:00
Erik Verbruggen
7516ef4969 TextEditor: get CompletionAssistProvider from editor.
And not from the global object pool. This way, the editors that have
different highlighters for various language dialects, or editors that
support multiple languages in a single editor, can decide themselves on
what CompletionAssistProvider to provide.

Change-Id: Ieebc4a8e7b3de6470fdb8103035aa3b8b2ba6598
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-09 10:15:55 +02:00
Orgad Shaneh
33fd157b34 Git: Support recursive clone
If checked - includes submodules

Change-Id: Ie70dad7f4bd66d97467b5a02bcb7db72167217fd
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-09-09 09:50:35 +02:00
Sergio Ahumada
b1962162d0 Merge "Merge branch '2.8'" 2013-09-06 17:37:14 +02:00
Thomas Zander
eea64bea49 Fix copy/paste, check both Qt versions.
The Blackberry plugin could give an error due to a copy/paste
issue which checked one item twice.

Change-Id: Icc3d10cda0a6e17088445c9feba862fd2d468b70
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-09-06 16:56:13 +02:00
hjk
a9ab174f9b ProjectExplorerPlugin: Make settings accessor static
Change-Id: Ic4c78e4d2eefeefe55e2868a7f9db1eca52c3863
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-06 13:42:13 +02:00
hjk
61a8257b68 Core: Clean up ExternalToolsManager interface
Change-Id: I8ea81de7350bdb0c6243d65596196d615845ffc4
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-06 13:41:51 +02:00
hjk
9d1cc97126 Locator: Clean up LocatorManager interface
Change-Id: Ib401b6eca8c291526268ccea4d9e7e66f08abe1c
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-06 13:41:33 +02:00
hjk
948a9a05c2 HelloWorld: Remove unneeded and "strange" declaration
Change-Id: Id2a28fdfb303c82432af1092a082fa68a1cb850d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-06 13:24:25 +02:00
Tobias Hunger
89b28ef249 Qmake: Rename emitBuildDirectoryChanged()
The method is used to reset the build directory if shadow building
becomes unavailable due to the Qt version changing. It does not
explicitly emit anything anymore.

Change-Id: I27b46b77f334be62f4db5f269529f8a2d62d834b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-06 12:28:35 +02:00
Tobias Hunger
1f8cb204de Qmake: Do not have qmake config change build directory
Change-Id: I538b4576490d62f3c1f8555fdeffdafecf797e7a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-06 12:28:29 +02:00
Tobias Hunger
cc5c45f454 Qmake: Re-parse project after changing the build directory
That is necessary so that the executables get updated.

Task-number: QTCREATORBUG-10107
Change-Id: I42e3ce38a5824e285546c43a3ec0045b090c6af5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-06 12:28:20 +02:00
Oswald Buddenhagen
a4d714e23d Merge branch '2.8'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	tests/system/shared/project.py
	tests/system/suite_general/tst_create_proj_wizard/test.py

Change-Id: Id9b80f049143dc8e108ed90bdc7c1ab40ba829ef
2013-09-06 12:20:44 +02:00
Leena Miettinen
872f87f5e9 Doc: fix link to the QDoc Manual
In the Writing Documentation topic of the Extending Qt Creator
Manual.

Change-Id: Iebe960cc878469fb34951a196558d8a7cb22f11f
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
2013-09-06 10:28:45 +02:00
Nikolai Kosjar
551b18f304 C++: Tests: Fix tst_Semantic::lambda_2() test
Change-Id: Ie405a9339d13615efb1113614a7dcd7069849b4f
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-06 09:58:02 +02:00
Mehdi Fekari
aef2df499a Qnx: Refactor BlackBerryApplicationRunner class
This patch refactors the BlackBerryApplicationRunner class and
instantiates two log processes using slog2info and tail commands.
The latter is used to get error logs if the application fails to launch.

Slog2info display logs only when the app is correctly launched.
If the app failed to launch (failed to load shared libraries... etc)
the error logs are then written in /accounts/.../appData/logs/log.

Change-Id: Ie2804ba7a3f67e40ece1e6973cfbcb2ee11ae0b0
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-09-06 09:36:43 +02:00
hluk
59c35e96c4 FakeVim: Explicitly enable some options for tests
Since there is now separate configuration for tests
(f3ca72f989) it became obvious that
indentation options are disabled by default.

Change-Id: If13b16b05c5f11171aa49d6964d7e55e2a790646
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 18:55:49 +02:00
Robert Loehning
c77c392cb9 Squish: Trying to stabilize tst_SCOM01
Change-Id: I895d763fdee4b15a36e109ee9f46d84635afa6a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-05 17:47:38 +02:00
Robert Loehning
f7c67d5521 Squish: Add test case for git clone wizard
Change-Id: I4b4415d8a9b40b16be609286f0f07a63c4dd88bc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-05 17:44:50 +02:00
Friedemann Kleint
1d56d718cd Add <platform> element to pluginspec-files.
The <platform> element may contain a regular expression
matching the names of the platforms on which the plugin works.

Task-number: QTCREATORBUG-9002
Change-Id: Ic816cfed69a5dd2c4112c976843b9106ba2cbd22
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 16:40:24 +02:00