Commit Graph

31523 Commits

Author SHA1 Message Date
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
Volker Vogelhuber
54a114e639 fixed memcheck using valgrind on remote device
Change-Id: Ie2ded39c73dce99db574b16cb8e0e1ffb7ba2415
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 16:36:54 +02:00
Christian Kandeler
f6e2cfc2af Autotests: Add some helpful output on failure.
These turned out to be useful when investigating test failures.

Change-Id: I2e588123dba84bfdfa1094d70bc604e7dfca02ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-05 15:55:29 +02:00
hjk
ad58c2bb44 BuildManager: apply 'static' pattern
Change-Id: I00bb591c027a22088d5f1feedc84aa28523dcca2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 15:37:43 +02:00
Christian Kandeler
e5c7ac61ec ExtensionSystem: Add missing check to autotest.
There was no check whether the plugins to be examined actually existed,
meaning the autotest would erroneously succeed if they were not at the
right location.

Change-Id: Icd230ad7ecac9852a4ba0887e278fe9e098d084b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-05 13:16:30 +02:00
hjk
9fe9706803 ProjectExplorer: Clean up remaining SessionManager uses
Change-Id: I170edc81cc2bcb4de4168c5ec38d3897c2e7c7e8
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 13:13:06 +02:00
hjk
0126672336 Compile fix with Qt 4
Change-Id: Iae87c5c9c19de1bf7fc5e4d354f96f0365315324
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 13:12:36 +02:00
hjk
527046acc2 MessageManager: General cleanup.
Apply 'static' pattern, rename 'printToOutputPane' to 'write'

Change-Id: I6f31f1a8c914661e2a2182c0b6256b41ead28de7
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:51:00 +02:00
hjk
aadb6f16af SessionManager: Apply 'static' pattern
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:28:12 +02:00
Daniel Teske
dab9886ebf Android: Make ant less verbose
Change-Id: Idfd2510f2711be27219676bb843ab6e32b84c8e2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-09-05 11:37:42 +02:00
hjk
5e5d840b53 Debugger: Streamline settings access pattern
Change-Id: Ie73b8d9fa945ee9dcbab67177410cc782979c8ad
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 11:07:00 +02:00
hjk
cd17a0e400 Debugger: Don't add invalid items during validation
Change-Id: I3b6427ec038d61ea3166880ae51292f87f7b861b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-05 10:52:51 +02:00
Nikolai Kosjar
48d1e8ebbf CppTools: Tests: Fix leaving test file around
Change-Id: I232194e2693a8024ff67945cbc70049e52b9ef5d
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 08:21:04 +02:00
Friedemann Kleint
dc108bc31f Replace QObject::tr() by tr-functions.
Change-Id: I2e3867b682db971662250c04dec609fd4e3817ea
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-04 16:30:42 +02:00
Tobias Hunger
cc80b92bb6 Find: Another build fix for windows
Change-Id: I21e85b1536981bb55f0e1e5b46aed7a8a1e460c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 16:27:12 +02:00
Friedemann Kleint
11a4a6af58 Add tr()-functions to DebuggerItemConfigWidget.
Change-Id: I437ab8ba95ccdddf7693d98f9aff400b03ad79d4
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 16:24:12 +02:00
Tobias Hunger
18bc29fb02 Find: Build fix on windows
Change-Id: Ie86d515eec537a8d395f0a52f8dad4bd5f3ca851
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 16:23:13 +02:00
Tobias Hunger
f5a7a74191 Find: Turn SearchResultItem struct into class
Change-Id: I0ef59e409310c893b790d3182fcc2a91664e83c9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 16:23:02 +02:00
hjk
36b0125d2b Find: Compile fix
Change-Id: Ie1c5a229e7c54f62acda60e49812dc5ef40b5bc0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 16:05:09 +02:00
Christian Kandeler
15d1048ef2 Fix some include statements.
In several places, it says '#include "..."' for headers
from different libraries/plugins.

Change-Id: I96cd74fef9b30163adefe3e1720e0847bed9553a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 15:51:36 +02:00
Marco Bubke
041c584805 QmlDesigner: Only non xy binding item should be highlighted
Change-Id: I4fe0540451e522e57ee73234638bf84cb6071a45
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:14:56 +02:00
Marco Bubke
6cf4b5caad QmlDesigner: Items should be only selected if the have no xy binding
In the rubber band selector.

Change-Id: I132681870bc5ff75c43c0874bee9b7a76362e35e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:14:49 +02:00