Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
11e7c706be Git: Make tree layout consistent on add branch
Change-Id: I3b49d76ef0e3da9ab60d6859a8b8e18092794bbb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-19 22:06:22 +02:00
Thiago Macieira
b169be6132 Fix compilation: std::lower_bound is in <algorithm>
Change-Id: I5ab897725e47dba949c25cab5e5e3d4406ce4d8a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-19 19:10:44 +02:00
Eike Ziller
4babcabf20 Make it possible to build Qt Creator installers on Mac too
Change-Id: Ic3e6f773cb0c2c41f83c6f8d54ed4e0151c69b40
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-19 18:42:23 +02:00
Robert Loehning
69da367a39 Squish: Enabling WELP03 on Windows.
Change-Id: I3fb14d07b1f2b18b5486738a604a8ba9e0f89eb7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-19 18:07:19 +02:00
Orgad Shaneh
fe4b6feeb3 Debugger: Pass data-directory to gdb on Windows
Required for gdb 7.6

Change-Id: I5d02a6b712fbd5c3f70ac4c83871b03197f95696
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-19 17:52:21 +02:00
Leena Miettinen
f939deafad Doc: All Versions option was deleted from Examples tab
Update screen shot.

Change-Id: I4b932eda8cfc5b43a2d0662f046fbf40a2ef8d56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-19 17:26:46 +02:00
Leena Miettinen
9fe2808360 Doc: when adding Qt versions, qmake folder is selected first
Changed the text to describe the process more accurately.

Change-Id: I7ea9eba2b1b70ea764895beb4401a287644e8f45
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-19 17:12:37 +02:00
Christian Stenger
39103dee4f Squish: Fix WELP03
Examples from Welcome Page can be used from Qt4 or Qt5 now and
Qt5 examples are chosen by default.

Change-Id: I2b94214b3fd12b56143ed3ea1026466ae7ffa0f3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-19 17:07:56 +02:00
Leena Miettinen
c469964ca5 Doc: remove obsolete \if defined commands
The doc sources are no longer used for single-sourcing.

Change-Id: I934c88c19646d84b4de3c5787234148f947c4489
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-19 16:21:42 +02:00
Friedemann Kleint
848741fda0 Update German translation for 2.8.
Change-Id: I567d69a83d3e4b3b960d9aacd11d5b0d7be75b9d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-19 15:27:22 +02:00
Marco Bubke
f382197a5c QmlDesigner: Fix crash for in file component change
Change-Id: I666dd0ca2b7e50584ae2ad5577ec2f4c685fb209
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-19 12:43:38 +02:00
Daniel Teske
6c64a0d9aa Qt4RunConfigurationFactory: Simplfy code
Change-Id: I4ed28ef19d5799e1e2818752b3bd169984d6f9ad
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-19 12:31:40 +02:00
Daniel Teske
af254e47aa CMake: Save all files before running cmake wizard
Task-number: QTCREATORBUG-9537

Change-Id: Ie5e4ffd33a9a9108c2e12bf8e71d932f6586053c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-19 12:31:09 +02:00
Eike Ziller
f7349e49df Fix build
The (un)expectDirectoryChange API addition has been reverted

Change-Id: I4736f51a77eb2f63b3e4a7b44426ad15a06624c7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-19 11:49:52 +02:00
Eike Ziller
1ef2e51cf8 Installers: Use standard license agreement texts
The way it was done is deprecated in IFW 1.3 and removed in 1.4, and
there's no reason for us to use non-standard texts.

Change-Id: I05ef4974a3f47bd8ffe0bb3b1a226adac48aa954
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-19 11:06:33 +02:00
Orgad Shaneh
5c900d205d Revert "DocumentManager: Support expect/unexpect directory changes"
Doesn't work

This reverts commit f6ec8c3342.

Change-Id: I84ecb956bd8ad2358228e11630e95ac03c903c21
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-19 11:05:23 +02:00
Nikolai Kosjar
91d8ecbd60 DiffEditor: Fix warning about initialization order
Change-Id: I321357cbc1aca79ea28c53bfd10945be51666275
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-19 09:52:26 +02:00
jkobus
b5be527eb9 DiffEditor: Show tooltips with filenames
Change-Id: I32af3b310deb4c96bf1dc798392029cc361ced97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-19 09:12:49 +02:00
jkobus
f5a2c1469a Add a DiffShowEditor showing an additional info
Task-number: QTCREATORBUG-9489

Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-06-19 09:11:42 +02:00
Tobias Hunger
a304fb45fc SDKtool: Fix a warning in test code
Change-Id: I5510295ec0dd631031402ca681b4275f1b4adb83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 22:19:39 +02:00
Tobias Hunger
cc14bdc640 SDKtool: Fix another warning in the test code
Change-Id: I5729b86f1fb94bdc815cef21a686558179dac032
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 22:06:51 +02:00
Tobias Hunger
d1370824a5 SDKtool: Fix warning in test code
Change-Id: I6b6ce64298f7d937658148a88aa7c0d0fa7b2689
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 21:18:02 +02:00
Leena Miettinen
6312936c32 Doc: reflect changes in the Gerrit dialogs
Update field labels and screenshots.

Change-Id: I8285a2d4f4ef663296993a1fa23088ebba6f6052
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-18 16:54:30 +02:00
Lorenz Haas
af0582cdc9 CppEditor: No triggering for AssignToLocalVariable in return statements
With this patch it is checked if the function/new-expression is used in
a function call or return statement the whole AST down to the
translation unit.

Task-number: QTCREATORBUG-9525
Change-Id: I34b30ee64b9436c9c9d2586c28fd22f148bee892
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-18 16:48:28 +02:00
hjk
43e810759d Debugger: Re-enable a few dumper auto tests
Change-Id: I11fc41faebcd27d0d4a6ac5d06f0ce0fa3af8f29
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-18 16:47:46 +02:00
Eike Ziller
f3451e92a1 Fix that sometimes documents are opened in wrong split
Task-number: QTCREATORBUG-6433

Change-Id: If1626c1a2c406af48a8d7c630c353e138a37aa2e
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-18 16:01:31 +02:00
Tim Jenssen
677b3104e9 fix locked DMG after installing Qt OSX package and starting creator
- the workingdir was inside the dmg so it couldn't unmounted

Task-number: QTBUG-28963

Change-Id: I183098108743d9cc0bd00fb6bfaa3e5755c08191
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-18 15:51:15 +02:00
Marco Bubke
89db22a1c8 QmlDesigner: Better componentComplete
Change-Id: I2bfdbeabd4d08474d50434d7e13c32b780e783ca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 15:10:43 +02:00
Marco Bubke
30d3e7e51d QmlDesigner: Fix preview rendering
We excluded item which had a node instance. For the preview all item should
be marked dirty.

Change-Id: I0cbad89707d7d94f65ac0d055488e124da40e7b3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 15:09:26 +02:00
Leena Miettinen
6b65e72dd5 Doc: update Configure Projects screen shot
Change-Id: I84b9b02a92e815787dd457e6b6a71781eb005a15
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-18 14:13:35 +02:00
Leena Miettinen
70c751f2c2 Doc: fix table in the VCS topic
By removing an extra \li command.

Change-Id: I1a5c97123757a3bc3c767b43be2ab99b9e12e212
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-18 14:13:17 +02:00
Tobias Hunger
98c10460c4 Qbs: Use different Icons for products and groups
With subprojects the tree is getting too confusing when everything
uses the same icons.

Change-Id: Ib1b8559c5f6e8a3c4299498db67d33c9eb916d66
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 14:07:04 +02:00
Tobias Hunger
3d2e40f85f Qbs: Support subprojects
Change-Id: Ic7015b44362b89a14957f7d21540e71d441c860f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 14:06:54 +02:00
Christian Stenger
94987b2f5b Squish: Another snooze() for selectFromFileDialog()
Change-Id: Ibc24c27a8e69ba7eb039618ea416b2e84da6e617
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-18 13:13:50 +02:00
Thomas Hartmann
88e727922e Wizards: getting rid of pointless empty line
An imagte with invalid path creates a poinless empty line.
Check first if image does exist.

Change-Id: Icaaafc26c81756a076683eff42ce6c9e72185f0b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-06-18 13:11:40 +02:00
Tobias Hunger
501089d632 Qbs: Fix logic inversion
Change-Id: I635a1a9704171f70ef07dbe2ba23806cec0136b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 12:53:15 +02:00
Tobias Hunger
a1921d91f4 Qbs: Adapt to the latest round of API changes in Qbs
Change-Id: I59fd151a1a485990ca0da7dac4fdc028f915ec6b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-18 12:34:03 +02:00
Thomas Hartmann
396cedf3c5 QmlDesigner: use correct icon for vertical slider
Task-number: QTCREATORBUG-9558

Change-Id: Ib06006ea986eea307bfb6fc3289dce7468de0b48
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 12:01:53 +02:00
Daniel Teske
bfa0bad74c AndroidRunner: Fix CheckPidTimer to not fire forever
- Only start the timer after we are sure that the app is running.
- Stop the timer if we detect that the app was closed.

Task-number: QTCREATORBUG-9545
Change-Id: I7d08b759d3aa5baaa3f82ee09aefb17e7c5fb512
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-18 11:59:52 +02:00
Erik Verbruggen
e11ee89916 C++: show signal declarations when searching for functions
Instead of showing all function declarations when searching for methods,
only show signal declarations. Otherwise, both function declarations and
their definitions would show up, which is not too useful.

Task-number: QTCREATORBUG-9543

Change-Id: Ia81e422e4c53dbc4199b30b1d362f4829b337a7f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-18 11:22:24 +02:00
David Schulz
327e7bdf6f Debugger: Fix exception caused by wow64exts.info.
Task-number: QTCREATORBUG-9526

Change-Id: I79d09a7e975576ee68db3645142a567b4af4c646
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-18 11:12:02 +02:00
Robert Loehning
812b321738 String fix
Change-Id: I986e10413d88cb6c0b1d4822b4485a7ec4bb946c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-18 11:02:47 +02:00
Przemyslaw Gorszkowski
68d6a762d9 C++: add support for local types
This change addes support for class, enum definition inside blocks({}) or
functions, e.g.:
void f()
{
	struct S
	{
		int bar;
	};
	S s;
	s.bar;
}

It fixes:
* code completion
* highlighting
* follow symbol
* marking
* find usages

It fixes also problem with namespace aliases inside blocks or functions.

This change can have also impact on performance(there are additional processing)

Task-number: QTCREATORBUG-166 (namespace aliases inside function/block)
Task-number: QTCREATORBUG-3620
Task-number: QTCREATORBUG-6013
Task-number: QTCREATORBUG-8020
Change-Id: Iaea6c6dfe276f1d7b2279b50bdd2e68e375d31eb
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-18 10:09:51 +02:00
Nikolai Kosjar
0d2f052560 CppEditor: Fix translatable strings
Task-number: QTCREATORBUG-9570

Change-Id: I4bdc0f900bdf8e6e5fce8668a8c6b23bcd67abff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-18 10:05:56 +02:00
Eike Ziller
7a7efd3e2e Fix path to qt creator documentation.
broke with the introduction of ICore::documentationPath in
60f7f00e41

Change-Id: Ic63ded85bcbe27f64ad2a9436683472cc8bf01b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 09:47:28 +02:00
Leena Miettinen
c915b3247d Doc: wizard to creating projects for code snippets
Change-Id: Ic200b6d4afdc01a9ef9060bcadf0159b8a2cc61c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-18 09:10:34 +02:00
Marco Bubke
bc1c136fe5 QmlDesigner: Remove legacy code in NodeProperty
Change-Id: I1a4ef49518ff455f7f057d649079ed1d10bbc4d0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-18 08:54:04 +02:00
Petar Perisin
159a7d61dd Git - stash scope guard in submoduleUpdate
Change-Id: I888d4013e88fdc6977f29ef3e27d243e55a1f1a7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-17 22:22:31 +02:00
Tobias Hunger
dce41176d8 Qbs: Avoid useless reparsing when possible
Do not trigger a reparsing when e.g. changing environment variables
that qbs does not access.

Change-Id: Ieda4f68112d372c561d99c8dffe016af0d31ad41
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-17 18:35:39 +02:00
Leena Miettinen
57f1251922 Doc: link to top level instead of individual topics
Link to Using Other Build Systems instead of to each
build system, as we keep adding them.

Change-Id: Ic033c7c0450bab66af9f24deb76d56469cd88fb6
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-17 16:43:20 +02:00