Commit Graph

36835 Commits

Author SHA1 Message Date
Christian Kandeler
e639455936 QbsProjectManager: Reparse project before building.
Otherwise, if "save before build" is enabled and the user presses Ctrl+B
with unsaved changes to a project file, these would get ignored due to
the delay (and also if the delay were not there, because the file system
watchers trigger later than the "Build" action).
If there are no actual changes to any build file, the overhead caused by
this operation consists of loading (and possibly storing) the build
graph file.

Task-number: QBS-596
Change-Id: I1f837cc0fcdc77a249b423834f4b6711f5c0bc87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-16 14:05:38 +02:00
Christian Kandeler
cbeb77030f Autotests: Fix qbs build.
The semantic change in product.buildDirectory broke some autotests.

Change-Id: Ic9336f1e9341adacd1daa763b7ba729d7973fe58
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-16 14:02:19 +02:00
Orgad Shaneh
c5d34eb6b3 Git: Use Git bin directory as an additional path
Change-Id: I4738a4aec3b1b83b6d596497842086aeb1278f27
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:43:36 +02:00
Orgad Shaneh
54db877297 Git: Factor out resolving of bin directory on Windows
Change-Id: Ifbafa0f5cb8329faedfd1da3674b87e46001acc3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:43:32 +02:00
Robert Loehning
36d2f47dcc QmlDesigner: Language
Change-Id: I566d43144ce8ace585099041f63f3a2c9e1009d7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-16 12:34:59 +02:00
Eike Ziller
e470038c59 New Dialog: Do not show wizards on top of everything else
Just live with the fact that there is not even a way to keep it on top
of the main window or something like that (without also making it a tool
window).
Also, even though it would be nice to have the "New" menu item bring the
current wizard to the top, if any, that requires heavy refactoring in
the wizard side.

Change-Id: I93d345964b085adeaa314d93acc612f8fb2e7e68
Task-number: QTCREATORBUG-12675
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 12:23:53 +02:00
Andre Hartmann
f6bfd75320 Git: Fix suggested directory for clone
For:
* remote paths with port number
* local repositories

Task-number: QTCREATORBUG-12651
Change-Id: I7fef5c78499291047781ab48a7fef31d52613198
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-16 12:00:15 +02:00
Leena Miettinen
79704ebb8a UI text: replace "e-mail" with "email"
For consistency.

Change-Id: I0b8244a7d6b86c3fc0cccf24b220e3264f0ee116
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 11:44:36 +02:00
Leena Miettinen
142bc18881 TextEditor: edit MIME type description for primitive types
To make it more consistent with the other descriptions.

Change-Id: Ia7b5f046976e5ae18f68e1afba7b971b89898e39
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:38:45 +02:00
Leena Miettinen
a394158858 Session Manager: fix capitalization of UI text
Change-Id: Ic9b73f694ceeff7dbefc02126551124818e7a358
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:29:41 +02:00
Leena Miettinen
38961dbff3 TextEditorPlugin: replace "quick fix" with "refactoring action"
"Refactoring action" is the term used in Qt Creator Manual.

Change-Id: I10dd3ecb615f24a9b5fa5d9ae8aa160969146e72
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-16 11:24:08 +02:00
Marco Bubke
1a35a71648 QmlDesigner: Support Qt4 again
Task-number: QTCREATORBUG-12567
Change-Id: I5a6b7c4ca31f20d25301cc6fc19a549ce895c0b4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 18:45:22 +02:00
Lorenz Haas
9b2557de7d Beautifier: Add @2x icon variant
Change-Id: I839bdd215a9f70d2641a159166bda9f90db555e0
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-07-15 17:54:05 +02:00
Marco Bubke
4d8d1d1867 QmlDesigner: Really stop the compiling of the puppet
Never rush some fixes. ;-(

Change-Id: I6c7bd21ebbb53630fc398540b8f7e28726ebd81e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 17:49:57 +02:00
Fawzi Mohamed
43aa3902b3 qmljs: remove absolute path library imports
Change-Id: Ib1d6708b7f280d5906452ae5fefc11f8a8700db9
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-15 17:06:11 +02:00
Fawzi Mohamed
cd92b70f65 qmljs: avoid reset if C++ types did not really change
Change-Id: I00b59a6b140eb33e2f3206f11e6ab0f9b470dff0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-15 17:05:27 +02:00
hjk
1541fbd2ba FancyMainWindow: Use auto-hiding dock title bars
Instead of the manual hard-to-discover "Locked" action

Change-Id: I08e3b65d3e620adfa1439a8de6e028ecfbdec16d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-15 16:38:05 +02:00
Eike Ziller
08f12e95d0 Update binary-artifacts branch setting
Change-Id: I779a7c3a12d03f0d1920c89b38b019b81502712b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-15 15:34:55 +02:00
Marco Bubke
61f64e1f4c QmlDesigner: Skip the puppet creation
Task-number: QTCREATORBUG-12554
Change-Id: I664fa943e6b5399c01cdcb8cfe5cf72ba8b3ae58
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 14:13:33 +02:00
Marco Bubke
b0ee5e601c QmlDesigner: Check if process is available
It can be happen that we get output before the process is assigned.

Change-Id: I4419b125fc9e7244142c188c8bdf0a030faf850a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 13:37:44 +02:00
Marco Bubke
36dc3fb01c QmlDesigner: Remove call to SubComponentManager::update
It has no model attached so is doing nothing and called later again.

Change-Id: Ide36ba5640ff18e29d5be2ad5911ed448f37c92b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 13:29:37 +02:00
Marco Bubke
d8457b63c3 QmlDesigner: Check if the puppet source are newer than puppet
And recompile puppet in that case.

Change-Id: Ia19d54aaa83a4b267de515b6eac5d367f943d7c6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-15 13:29:31 +02:00
Eike Ziller
24be584077 Search result pane: Make the history combo box more present
By adding a title, and a left border.

Change-Id: Id8a577c9011c7a7282f5b540e94e8f809481b6fa
Task-number: QTCREATORBUG-9104
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-15 12:43:03 +02:00
Eike Ziller
c3d10509b9 Qrc: Preserve line ending style
Change-Id: Ib8f57ee07fd5aff1089103cdeedbfec1003bf1cb
Task-number: QTCREATORBUG-6681
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-15 12:07:08 +02:00
Orgad Shaneh
616ea2e5bb Git: Fix opening repository log when commit editor is open
Opening a commit editor inside a submodule then executing
Local Repository Log opens the log for the supermodule.

Change-Id: I264925e0f23e2372a09a28e788174a747f5870a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-15 10:42:29 +02:00
Friedemann Kleint
5189c990aa Bump CDB extension version for 3.2.
Change-Id: I26a9277ae9d83057043e28a355a7646467118999
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-15 09:45:28 +02:00
Eike Ziller
2e88a7f6c9 Fix deployment of clang code model plugin.
Broke with the removal of the QtProject subdir for plugins

Change-Id: Ic42d3e9b902f7ac228e62923093dfe6af01b2d19
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-15 08:21:55 +02:00
Christian Kandeler
076896d4f3 Update qbs submodule.
Change-Id: Ic920b4befb363486c0f828bdee9711280fb509f1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-14 20:48:46 +02:00
Tim Jenssen
be63939397 QmlDesigner: no warning at type "binding"
Task-number: QTCREATORBUG-12509
Change-Id: I650d65322aee34b9fb3c559a8a4566f274b324cf
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-07-14 18:58:09 +02:00
Christian Stenger
e84fbe4807 Tests: Fix linking on Win
Change-Id: Idf5b669d48733754d943d95e9250a0c59d71c863
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-07-14 17:40:25 +02:00
Eike Ziller
82296d3209 Wizards: Close wizards with escape
Since they are no longer modal, the "return to editor" shortcut was
executed for the escape key instead.

Change-Id: I4505f49105ad46f7c5f9e0257e77a8ca4652ef06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-14 16:26:58 +02:00
Eike Ziller
bef7181ed0 Set parent for options dialog where appropriate.
Otherwise the options dialog might appear behind the current "dialog"
(for example the "new" wizards).
Also, take ICore::dialogParent as default.

Change-Id: I4578e269db5763842a942549a45ec8cdd6b28b5d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-14 16:24:26 +02:00
hjk
b87867e905 Debugger: Make QString expandable
Change-Id: I7cbbe7ce4e82e3e30f54ffd4e731a136fdc15e6b
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-14 16:14:17 +02:00
Orgad Shaneh
af8c8d4e0c Debugger: Only update executable from core file when needed
Conditions:
1. Not empty. It erases the existing executable for no reason.
2. Not Windows -> Windows doesn't produce core dumps, so the path inside it is
   unlikely to match anything on the host.

Change-Id: Ib3cd1ae278d8bc9f6ad326821319ca3deda44800
Reviewed-by: Thomas Otto <totto@zbh.uni-hamburg.de>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-14 15:58:05 +02:00
Leena Miettinen
e1650b5c46 Debugger: replace "maximal" with "maximum"
Change-Id: I14801dbbb7d8a853f6a9952949157088941c7ae5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-14 14:52:43 +02:00
Marco Bubke
a48b226784 Revert "QmlDesigner: Don't update sceneTransform for direct movements"
The resizing is not working any more.

This reverts commit afc498e24e.

Task-number: QTCREATORBUG-12653
Change-Id: Ie5b7ebd2f8810bbdc877b61e16591c5a2bbcf2d4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-14 14:16:40 +02:00
Leena Miettinen
67f32ea16e UI text: capitalize "Open With"
Because the preposition is the last word in the function or title.

Change-Id: I3648f5723eaf63faef097ea80f30a4576136a4e8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-14 13:35:15 +02:00
Eike Ziller
0fc20de475 DocumentModel: Remove unused function
Change-Id: I6c7d125abb653349cb4f10364a92208ebeb6a5d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-14 12:58:10 +02:00
Christian Kandeler
20bfe889e9 QbsProjectManager: Fix handling of overlapping parse requests.
The current code simply asserts when a new parse request comes in while
parsing. However, that condition is easily triggered, for instance if a
project file is saved to disk during a parse operation. Such updates
currently have no effect at all (other than triggering an error
message).
Instead, we now cancel the old parse job and start a new one.

Change-Id: If2eeb93b85b5163dcea99785a0fc89a254d082db
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-14 11:23:46 +02:00
Orgad Shaneh
051bccf89e Changelog: Remove duplicate entries in C++
+ fix 1 description

Change-Id: I70f7ac0651b11cdc2b9fedff35d3da8ced4e888e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-14 10:58:22 +02:00
Orgad Shaneh
e6d85ebb17 Valgrind: Fix error display for shadow build
object() refers to the executable file (the build target), which
doesn't have to be inside the project's directory.

directory() refers to the directory of the frame's source file.

Change-Id: Icf9885d1346acbf42ea904e69d6c8eee4d6a40cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-14 10:39:41 +02:00
Andre Hartmann
c30856e657 Git: Add auto tests for CloneWizardPage
Change-Id: I6b186731eba56a70ce799f17fdf538bb674a5439
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-13 20:15:31 +02:00
Christian Kandeler
1f1eb5e4ba ExtensionSystem: Compile fix.
Change-Id: I61bf9597a7532230a897e0f609ded37a105eb9a2
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-12 13:57:08 +02:00
Nikolai Kosjar
72ecbb7255 PluginManager: Skip test run in case of plugin errors
...otherwise it might happen that no test functions will be executed,
which is highly confusing, especially since no error dialog will be
shown.

If there are errors, just print a warning and quit. If we do not quit,
the error dialog will be shown which might block build machines.

Change-Id: Ic347dfba8fefc0e0f375cf2363265008df56ee53
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-11 16:35:15 +02:00
Orgad Shaneh
18429ff390 Bookmarks: Narrow down line number spinbox
Change-Id: I0fa266bc27bd5520c3e94ec196c260db878fba5c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-11 16:02:26 +02:00
Orgad Shaneh
726847e48c Bookmarks: Use a spinbox for line number
Change-Id: I42b00caf1d744d79af93e7100daa8fed5f8a29a8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-11 15:44:38 +02:00
Orgad Shaneh
53ddc32e93 Bookmarks: Enlarge "Edit Bookmark" dialog width
Change-Id: Icd0b8e9720e4467cc66780b808cb4bf82a012938
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-11 15:42:50 +02:00
Eike Ziller
20c4a9f262 PluginSpec platforms: It is "OS X"
Change-Id: Ibb3c2be1401b3c09d38f0fd689658b409ff52f7b
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-11 15:40:41 +02:00
Kai Koehne
a9619af26c Fix compiler warnings about argument being non-const in virtual base method
Another follow up fix for 93304df038 .

Change-Id: I39c98ed2e769a048c00931bd3b850d4d50310d99
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-11 15:34:34 +02:00
Christian Kandeler
473692aa23 QbsProjectManager: Do not reparse the project after every build.
While it is true that additional information about target
artifacts can appear during a build, this data is already
present in the qbs::Project object and can simply be retrieved.
No reparsing is necessary.
The exception is when reparsing was requested while the build
was going on. In that case, we really need to do it after
the build has finished.

Change-Id: Ief3797782ad0ca5651974d4b5d3d64e1199ca9a5
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-11 15:05:32 +02:00