Commit Graph

31553 Commits

Author SHA1 Message Date
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
Marco Bubke
df695c6a4f QmlDesigner: Activate move tool only if selected item has no xy binding
Change-Id: I680bf47ad962f0a62d3507132970a3c0c02f2ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:41 +02:00
Marco Bubke
9a3495cba1 QmlDesigner: Movable items should be have no xy binding
Change-Id: I621472e4d51ceb786684ed0d69598724e853e4df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:34 +02:00
Marco Bubke
8fb5661f66 QmlDesigner: Don't show resize handles for a non movable item
Change-Id: Ie3e01a2b5f3e8296afaa8c87a307fb1ec07092d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:28 +02:00
Marco Bubke
17a10c6432 QmlDesigner: Don't show resize handles for a non resizable item
Change-Id: I02be8d0641b03206a6739c3f8820b2862745df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:22 +02:00
Marco Bubke
86375a8726 QmlDesigner: Add modelIsMovable to QmlItemNode
Change-Id: I211ce2bbea4dc12e4738cf8af96b3781d300005c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:03 +02:00
Marco Bubke
3afc362b13 QmlDesigner: Add modelIsResizable to QmlItem
Change-Id: I11020a8216b09d965e2cfd3cbc7ee804068d7370
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:45 +02:00
Marco Bubke
32ddd2b308 QmlDesigner: Add BindingIndicator
Change-Id: I46a763f87e19114e223b9eb897cbb89cf1f4c3d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:22 +02:00
Marco Bubke
dd742afd71 QmlDesigner: Update AnchorIndicatorGraphicsItem after updating anchorlines
Change-Id: Ibdde4d8a32abac8bc7b1572507c7a8094d28f604
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:13 +02:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 14:59:06 +02:00
Tobias Hunger
1f340d44f7 Fakevim: Add missing Q_OBJECT macro
Change-Id: I886861448ef704bde559bc847816da4c53f0fbde
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 14:47:09 +02:00
Tobias Hunger
f20a276182 Find: Remove some Find namespace usages
Change-Id: I3caf03474c7e080766b85c6a3042f6a29f13cd40
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 14:46:55 +02:00
Marco Bubke
a810c0847c QmlDesigner: Only top items without xy bindings are movable
Change-Id: Ic90faca4ffe71fbc52e3c7110a3a524ca9cbba27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 14:31:56 +02:00
Tim Jenssen
ff775f6d55 adding python to *.py package calls
- under windows we had the problem that *.py needs to be registered and
    even if we had it: a call with modified PATH variable resulted in
    strange two PATH variables in the environment (not sure that this was
    a problem of nmake or something else)
  - added -u to get the output unbuffered

Change-Id: I9326a31fc39a95b61d92bb00549f536db04af985
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-09-04 11:39:00 +02:00
Daniel Teske
b14a0e58e6 Android: Make sign package orthogonal to the debug vs release
This enables signing debug packages and creating unsigned release
packages.

Task-number: QTCREATORBUG-10060
Change-Id: I57d094972b451538e8e9e5104e803e50a4ba2336
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-04 11:21:54 +02:00
Friedemann Kleint
f869b587de Fix warnings about unused variables and */* in QML-Designer.
Change-Id: I5724ae5faad6a125b7da17436f0c6b83492d4ebb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 10:47:05 +02:00
Nikolai Kosjar
f3ca72f989 Plugin tests: Run in separate settings path
...if no settings path is specified by the user.

The default settins path for tests will be set to the system's temporary
directory + "/qtc-${IDE_VERSION_LONG}-test-settings".

Change-Id: Ibeaf8883c80169b4d6a3a97020a16f910292d67a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-04 09:56:12 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +02:00
Friedemann Kleint
435ec2ba51 Compile on Windows.
Breakage introduced by fa05b23a23 .

Change-Id: I45cf7f03d8d4d2a13300090d86f83cc3a15598f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 08:23:50 +02:00
Christian Kandeler
5b21ee5925 QbsProjectManager: Fix potential crashes when resolving a project.
First case: Re-parsing is requested while a project is being resolved.
The respective function can be entered more than once due to signal
callbacks, resulting in double deletion of the job object.
Second case: Closing Creator while a project is being resolved lets the
resolve job run unattended, resulting in a crash on exit.

Change-Id: I99e034a211ebe730dd02096ce76d601fbc848f5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:24:31 +02:00
Christian Kandeler
f27b738f65 QbsProjectManager: Add support for remote targets.
After parsing, we tell the target about deployable files
and executables, so it can make use of that information
for deployment and remote execution, respectively.
In addition, the current default deploy configuration (consisting of
just an install step) is now set up only for the desktop device,
since other targets will likely provide specialized deployment
solutions.
The most noticeable effect of this patch is that the RemoteLinux
target and its descendants now work out of the box with qbs projects.

Change-Id: I512d4e215f2fa540efd4de5f5c1e53abaa0596d1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:23:32 +02:00