2 years agoProjectManager: Qt Quick application templates via json wizard master
Alessandro Portale [Tue, 12 May 2015 12:21:38 +0000 (14:21 +0200)]
ProjectManager: Qt Quick application templates via json wizard

Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of
Qt Creator, the .qml.ui split is now optional.

Change-Id: I4b5ebcc35a585fad6ebc2e994711ca23e3300717
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2 years agoFix that activation mode default was accidentally changed to single click
Eike Ziller [Wed, 13 May 2015 08:15:26 +0000 (10:15 +0200)]
Fix that activation mode default was accidentally changed to single click

Sort of introduced by recent form layout fix for OS X.
Add the missing break statements.

Change-Id: I0862c34f31e4afc7d1834fa436c6193345205b9b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoReplace QRegExp with QRegularExpression in FileSearch.
Marcel Krems [Fri, 15 May 2015 01:48:07 +0000 (03:48 +0200)]
Replace QRegExp with QRegularExpression in FileSearch.

This fixes a race condition when searching in multiple files.

Task-number: QTCREATORBUG-14403
Change-Id: I5572d7f2cd9fe3c399efdf37e874d9773be76f57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoFileSearch: Avoid copy of function object.
Eike Ziller [Wed, 13 May 2015 09:26:28 +0000 (11:26 +0200)]
FileSearch: Avoid copy of function object.

Converting std::unary_function to std::function will create a copy,
which we do not want. Actually std::unary_function as a base class
doesn't serve a purpose at all in this context, so we can just remove
it. Bind a std::function to a pointer to our search object instead.

Change-Id: I31db62312eefdff19b09fbb4eb20e8e666125874
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoSubversion: Replace Subversion Checkout wizard
Tobias Hunger [Wed, 6 May 2015 14:48:07 +0000 (16:48 +0200)]
Subversion: Replace Subversion Checkout wizard

Replace the subversion checkout wizard with a Json wizard.

Change-Id: I969ff00e2e6fdc8088f8c7a928f80454cd987164
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoCVS: Replace CVS checkout wizard with a Json wizard
Tobias Hunger [Fri, 8 May 2015 15:55:28 +0000 (17:55 +0200)]
CVS: Replace CVS checkout wizard with a Json wizard

Change-Id: I27c5c76923bae3e4df514e228873330fd8232c7f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoProjectSummaryPage: Report no VersionControl as ""
Tobias Hunger [Wed, 13 May 2015 08:00:04 +0000 (10:00 +0200)]
ProjectSummaryPage: Report no VersionControl as ""

Returning QString() from here for unset vc will result in the
substitution to fail and thus will leave "%{VersionControl}" as
the text.

Returning a empty non-Null string will make turn the replacement
into "" instead, which is what is expected.

Change-Id: I9dc890deb5f9ea1ac28c1546e4c1bce804d196ef
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2 years agoQmlProfiler: Improvements to searching timeline event notes
Eike Ziller [Fri, 8 May 2015 12:30:30 +0000 (14:30 +0200)]
QmlProfiler: Improvements to searching timeline event notes

- Open timeline view when clicking search button
- Use the usual search tool bar
- Implement incremental search and the various search options

Change-Id: Id83ab502cf4175738a825f531d9e454169663765
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2 years agoValgrind: Code cosmetics
hjk [Wed, 13 May 2015 13:15:33 +0000 (15:15 +0200)]
Valgrind: Code cosmetics

Use covariant return types for aspect creation,
other aspects already did, it does no harm, so follow suit.
Add 'override'. Remove empty line.

Change-Id: I68e85f64e60becf47ee407eb6d1800f43c4d0755
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2 years agoEditorManager: Fix opening of editors based on editor id
Tobias Hunger [Wed, 13 May 2015 11:57:01 +0000 (13:57 +0200)]
EditorManager: Fix opening of editors based on editor id

Make sure the editor with the requested id will be in the
list of editors to use to open files. This unbreaks e.g.
the git submit editor which opens an empty file.

Change-Id: I51c76ae13ddf0077e895ca0a9b7797f664888c0f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoJsonFieldPage: Make the page honor the theme settings
Tobias Hunger [Fri, 8 May 2015 14:27:10 +0000 (16:27 +0200)]
JsonFieldPage: Make the page honor the theme settings

Change-Id: I9a286fa73392a86b6d7ed39389a7601450a42b88
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoTextEditor: Optimize alignment in class Parenthesis wip/boostbuildprojectmanager
Nikolai Kosjar [Mon, 11 May 2015 13:33:12 +0000 (15:33 +0200)]
TextEditor: Optimize alignment in class Parenthesis

Change-Id: I25d00a7d68fb85797c9d6edc5a3e70b698ce6b9b
Task-number: QTCREATORBUG-14390
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoExamples: Better check for non-writable location
Eike Ziller [Mon, 27 Apr 2015 07:28:35 +0000 (09:28 +0200)]
Examples: Better check for non-writable location

Checking the .pro file is actually not too relevant, so extend the check
to the .pro files directory, and more importantly, to the directory
above, which will be used as the default location for shadow build

Change-Id: I867118902abb2cf4b621e976b6ba953ef8f0431a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoJsonFieldPage: Support tooltips for all fields
Tobias Hunger [Tue, 12 May 2015 12:36:10 +0000 (14:36 +0200)]
JsonFieldPage: Support tooltips for all fields

Change-Id: Ie84e659d7cecf68753056db63a389173d725ebe4
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2 years agoJsExpander: Add methods to test file/directory existence
Tobias Hunger [Fri, 8 May 2015 08:49:11 +0000 (10:49 +0200)]
JsExpander: Add methods to test file/directory existence

Change-Id: Ia51b8d47299d855dd11e8bbcb05b22aea875e458
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoC++: Remove Dumpers
Orgad Shaneh [Sun, 10 May 2015 20:31:01 +0000 (23:31 +0300)]
C++: Remove Dumpers

Superseded by Overview

Change-Id: I2ae193b1b9265ed59b73315486a35c53f6c8068f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoDebugger: Disable watcher removals
hjk [Tue, 12 May 2015 13:19:01 +0000 (15:19 +0200)]
Debugger: Disable watcher removals

... when engine does not support watcher insertion while running.

Change-Id: I1b4500f75b43176df7dc31f4a5840afb2347dd36
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2 years agoAdd TerminalAspect convenience accessor
hjk [Tue, 12 May 2015 12:26:58 +0000 (14:26 +0200)]
Add TerminalAspect convenience accessor

Unbreaks build after 90f19ce.

Change-Id: I0f1ddec10abda39149dd3743bdff1d0186d1de31
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoJsonWizard: Trigger complete change when triggering Checkboxes
Tobias Hunger [Mon, 11 May 2015 15:15:41 +0000 (17:15 +0200)]
JsonWizard: Trigger complete change when triggering Checkboxes

Change-Id: Idb81fee165f5950d8a4dbe51fc79822594f9b3c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoJsonWizard: Handle Keepers when asking to override files
Tobias Hunger [Fri, 8 May 2015 12:34:37 +0000 (14:34 +0200)]
JsonWizard: Handle Keepers when asking to override files

Change-Id: Ib33311416ebc468a7755a76dabcf47155ca3f1f6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoMake shootout test work on OSX
Christian Stenger [Tue, 12 May 2015 05:20:15 +0000 (07:20 +0200)]
Make shootout test work on OSX

Change-Id: I0cac98b68ee67eb016e32eeb17fc41a2cce38d9b
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoJsonFieldPage: Add isComplete and incompleteMessage to Fields
Tobias Hunger [Fri, 8 May 2015 08:42:48 +0000 (10:42 +0200)]
JsonFieldPage: Add isComplete and incompleteMessage to Fields

This allows to do more sophisticated checks on the completion state
of the page.

Change-Id: Ibb6593fdc4e9c9f37e7d70c516f1a1410123191f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoShellCommandPage: Handle reject
Tobias Hunger [Tue, 5 May 2015 14:39:28 +0000 (16:39 +0200)]
ShellCommandPage: Handle reject

Change-Id: I310b55a4832c169df68d5fd13311bba66dbd973f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoJsonWizard: Allow to delegate accept/reject to the current page
Tobias Hunger [Tue, 5 May 2015 14:34:49 +0000 (16:34 +0200)]
JsonWizard: Allow to delegate accept/reject to the current page

Change-Id: I1d2826159ce1cd4f531a576720b9ba6f204d15fb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoShellCommandPage: Disable/enable back button
Tobias Hunger [Tue, 5 May 2015 14:26:26 +0000 (16:26 +0200)]
ShellCommandPage: Disable/enable back button

Change-Id: I19bed185ea89d47871efd07b34cc99b4739b7659
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoVcs: Make VcsCommandPage available to JsonWizards
Tobias Hunger [Tue, 5 May 2015 11:03:43 +0000 (13:03 +0200)]
Vcs: Make VcsCommandPage available to JsonWizards

Add a page to run checkout commands with.

Change-Id: I4c6a6f662c3dfa19fd8f837934e8173412ee6f36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoCMake: Use TerminalAspect in CMakeRunConfiguration
hjk [Tue, 12 May 2015 11:36:09 +0000 (13:36 +0200)]
CMake: Use TerminalAspect in CMakeRunConfiguration

Change-Id: I293252c2beadc6fc4b4650dbf09127aa5e7898f6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoQbs: Use WorkingDirectoryAspect in QbsRunConfiguration
hjk [Tue, 5 May 2015 07:48:50 +0000 (09:48 +0200)]
Qbs: Use WorkingDirectoryAspect in QbsRunConfiguration

Change-Id: I65811ff8afb5c8a637c68d5b0dba81ccee71c462
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoProjectExplorer: Rename TerminalAspect::m_isForced -> m_userSet
hjk [Tue, 12 May 2015 10:29:09 +0000 (12:29 +0200)]
ProjectExplorer: Rename TerminalAspect::m_isForced -> m_userSet

Change-Id: I209abef3e6682b2d3725e0e58e0289cd5757c497
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoJsonWizard: Add a generator that just scans an existing directory
Tobias Hunger [Mon, 4 May 2015 12:33:19 +0000 (14:33 +0200)]
JsonWizard: Add a generator that just scans an existing directory

This will be used in the VCS checkout wizards.

Change-Id: I68bbdefa6b8287dc50a4ec8a9ca6136831571d3b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoAdd std::map case for initializer list codesize shootout test
hjk [Tue, 12 May 2015 09:11:31 +0000 (11:11 +0200)]
Add std::map case for initializer list codesize shootout test

Change-Id: Iffb1193bfb741533645521b30d9181aa61dc5c12
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoFakeVim: Use more direct construction in vimKeyNames
hjk [Fri, 8 May 2015 12:41:01 +0000 (14:41 +0200)]
FakeVim: Use more direct construction in vimKeyNames

Change-Id: Ic230eaa95e4e9a4ad614af50297d6028fefaae6b
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoAdd codesize shootout test for map initialization
hjk [Mon, 11 May 2015 11:39:09 +0000 (13:39 +0200)]
Add codesize shootout test for map initialization

1286 bytes when using an initializer list,
7414 bytes for the insert(..., ...) sequence.

Change-Id: I10ad8b10fea962feb01e9dbb31a542a4b66680a7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2 years agoEditorManager: If opening a editor fails, offer other editors factories
Daniel Teske [Thu, 9 Apr 2015 12:10:35 +0000 (14:10 +0200)]
EditorManager: If opening a editor fails, offer other editors factories

Change-Id: Ia8cf298c1a62e01d6df6f9f871a8d3eafde5821d
Task-number: QTCREATORBUG-14064
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoJsonWizard: Add default implementation
Tobias Hunger [Mon, 4 May 2015 11:49:56 +0000 (13:49 +0200)]
JsonWizard: Add default implementation

Add default implementations for some generator methods

Change-Id: Id7c2dc76bd3f96bc9f2560e835981fcdad167f92
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoJsonWizard: Move code for opening files into JsonWizard
Tobias Hunger [Mon, 4 May 2015 11:44:08 +0000 (13:44 +0200)]
JsonWizard: Move code for opening files into JsonWizard

Move code opening files and projects directly into the JsonWizard.
It makes no sense to keep reimplementing this functionality in

Change-Id: Ib4686a262fa9b2c78028146d138c5bba5d5b604a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoautotools: Set a default buildDir
Ray Donnelly [Tue, 9 Sep 2014 23:17:42 +0000 (00:17 +0100)]
autotools: Set a default buildDir

So that the un-changed optimization in setBuildDirectory works

Change-Id: Ie31fb2722c663cd0f998458d536181f47c83a37d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoFakeVim: Allow to remap shortcuts
Lukas Holecek [Fri, 8 May 2015 07:30:50 +0000 (09:30 +0200)]
FakeVim: Allow to remap shortcuts

Allows to remap main window shortcuts with command for passing keys.

    noremap <C-S> ,<C-S>
    noremap ZZ ,<C-S>,<C-W>
    noremap f<C-O> ,<C-O>
    noremap f<C-F> ,<C-F>

Task-number: QTCREATORBUG-14413
Change-Id: Ib86637d55223b1f4ce31a88c1c7ae2e05cb2aff1
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoJsonWizard: Simplify handling of bools via JS
Tobias Hunger [Fri, 8 May 2015 15:20:18 +0000 (17:20 +0200)]
JsonWizard: Simplify handling of bools via JS

Change-Id: I5381e83f6714886b7bf8cbcb859e1dd3b115a6c3
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2 years agoCheckoutWizards: Use IVersionControl::createInitialCheckoutCommand
Tobias Hunger [Wed, 29 Apr 2015 14:46:45 +0000 (16:46 +0200)]
CheckoutWizards: Use IVersionControl::createInitialCheckoutCommand

Change-Id: I09dd38f66b9cad46d561493c2e27a833595d8728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoUtils: Add a WizardPage to show progress of a ShellCommand
Tobias Hunger [Fri, 23 Jan 2015 09:00:45 +0000 (10:00 +0100)]
Utils: Add a WizardPage to show progress of a ShellCommand

Use the new page in favor of the CheckoutProgressWizardPage.

Change-Id: I7801c146fa67d6fcf550616f3798a7a919aafb96
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoCheckoutWizards: Simplify code to look up specific pages
Tobias Hunger [Mon, 11 May 2015 11:02:36 +0000 (13:02 +0200)]
CheckoutWizards: Simplify code to look up specific pages

Change-Id: I0098e17585d73e05632027676e7712ef9c843da2
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoIVersionControl: Add method to get a ShellCommand for initial checkouts
Tobias Hunger [Wed, 29 Apr 2015 12:34:07 +0000 (14:34 +0200)]
IVersionControl: Add method to get a ShellCommand for initial checkouts

Change-Id: Iabc056dad186d788003b221afb34303c37fef728
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoDebugger: Handle case of os.path.sep being '/'
Ray Donnelly [Sat, 9 May 2015 13:49:19 +0000 (14:49 +0100)]
Debugger: Handle case of os.path.sep being '/'

On MSYS2, if QtCreator is launched from one of the msys2 shells
then the MSYSTEM env. var is set and our Pythons set os.sep and
os.path.sep to '/' so that it aligns with the default separator
of those shells.

fromNativePath(str) then fails to convert '\' seprators embedded
in binaries since str.replace('/', '/') is a noop. The operation
we want here is to convert all '\' to '/' anyway so this is more
explicit regardless of any opinions on our choice to dynamically
vary os.sep and os.path.sep

Change-Id: I76c05b188abca41c6a1b516c68b584e0c06e7235
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoGit: Use side-by-side layout for Fixup Previous Commit
Orgad Shaneh [Sun, 10 May 2015 19:58:47 +0000 (22:58 +0300)]
Git: Use side-by-side layout for Fixup Previous Commit

Similar to simple commit layout.

Change-Id: If9470d47159cba21f11aefc8e2cc4895d10ff409
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2 years agoDoc: Qt Quick 1.1 component was removed from wizard
Leena Miettinen [Fri, 8 May 2015 13:42:05 +0000 (15:42 +0200)]
Doc: Qt Quick 1.1 component was removed from wizard

Change-Id: Ife7a77e7e04fff88cb7c0760be5e81e798553056
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoSettingsAccessor: Also read hidden or system files
Daniel Teske [Thu, 7 May 2015 15:26:27 +0000 (17:26 +0200)]
SettingsAccessor: Also read hidden or system files

If the user uses a name with a . in front, those files need to read

Change-Id: I5d8a762afa5dc4cff646f2a5cf2e4eabf6f9bc99
Task-number: QTCREATORBUG-13127
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoVcs: Sprinkle overrides over IVersionControls
Tobias Hunger [Wed, 29 Apr 2015 12:27:09 +0000 (14:27 +0200)]
Vcs: Sprinkle overrides over IVersionControls

Do this in a separate step to keep the next patch more readable.

Change-Id: I37cfd5481dcbfda52135eccec30852aefde1b950
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoDebugger: Some Python 3 support for PdbEngine
hjk [Fri, 13 Feb 2015 22:15:28 +0000 (23:15 +0100)]
Debugger: Some Python 3 support for PdbEngine

Change-Id: I052bc093086a5da0b2cbd4e99df32e42627ceaf5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoBareMetal: fix warning
Nikita Baryshnikov [Fri, 8 May 2015 09:07:06 +0000 (12:07 +0300)]
BareMetal: fix warning

QObject::disconnect: Unexpected null parameter

Change-Id: I9b7fe695f7d9d6acb233d8e9ff1030636559d548
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoDebugger: Use simpler construction of basic types in LLDB dumper
hjk [Thu, 16 Apr 2015 15:06:57 +0000 (17:06 +0200)]
Debugger: Use simpler construction of basic types in LLDB dumper

Cheaper, more robust.

Change-Id: I989853dc288864f4088f09f60c8c5b717e4faef0
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2 years agoEditorManager: do not show endless errors
Nikita Baryshnikov [Tue, 21 Apr 2015 10:57:10 +0000 (13:57 +0300)]
EditorManager: do not show endless errors

when there are removed files in navigation history. Steps to reproduce:
Open file in editor. Remove it outside the qtc. Activate qtc. "File Was
Removed" prompted - agree to remove it. Navigate back(alt left two
times). Qtc goes crazy with endless Error messages like a "Cannot open /
path/to/that/dead.file for reading: No such file or directory"

Change-Id: I10a4c178ba83a8dc769895830b6f76da2e676556
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoManhattanStyle: Remove unused special property
Eike Ziller [Thu, 7 May 2015 14:01:54 +0000 (16:01 +0200)]
ManhattanStyle: Remove unused special property

That was used during the times where OS X still had alternating row
colors in item views.

Change-Id: I6622604502a768c4abeb42f25bcfea5c65f66395
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoTextEditor: Simplify definitiondowloader.h
hjk [Mon, 27 Apr 2015 14:51:02 +0000 (16:51 +0200)]
TextEditor: Simplify definitiondowloader.h

Change-Id: I01621753851a99275ef8bee2c55c69840dc29580
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoToDo: Proper filenames eliding
Denis Kormalev [Sun, 26 Apr 2015 22:13:35 +0000 (01:13 +0300)]
ToDo: Proper filenames eliding

It is more reasonable to elide filenames at left and messages at right

Change-Id: I980026eb558c6528da85a5ddb1a7125bb3d7fdce
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoManhattanStyle: Fix size of field in form layouts on OS X
Eike Ziller [Thu, 7 May 2015 14:17:10 +0000 (16:17 +0200)]
ManhattanStyle: Fix size of field in form layouts on OS X

The default in QMacStyle, to use FieldsStayAtSizeHint, just almost
always is the wrong thing to do. Additionally this goes undetected for a
while most of the time, because most people do not run their code on OS
X. Override it globally to AllNonFixedFieldsGrow like in other shipped

Task-number: QTCREATORBUG-14337
Change-Id: I3b0719c0201871fbf0163b54b1a54823bf5d14f3
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoAndroid: Properly quote parameters to make install
Daniel Teske [Wed, 6 May 2015 16:14:35 +0000 (18:14 +0200)]
Android: Properly quote parameters to make install

Change-Id: Id39b63876938c6759829786f54f2448ff730d500
Task-number: QTCREATORBUG-13868
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2 years agoUpdate change log
Eike Ziller [Thu, 7 May 2015 13:11:27 +0000 (15:11 +0200)]
Update change log

Change-Id: I9b7b7a7e0f4170e58433a5e1fcfbbcf635751beb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2 years agoCommandMappings: Do special filtering only for keyboard shortcuts
Eike Ziller [Mon, 27 Apr 2015 13:39:09 +0000 (15:39 +0200)]
CommandMappings: Do special filtering only for keyboard shortcuts

The view is also used for the regular expressions for FakeVim's
ex command mapping, so we should not do special filtering for
keyboard shortcuts on OS X

Change-Id: I437b45a53beb93caeaec43af2f898c55b2a1601f
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoFix loading project settings
Alexander Drozdov [Wed, 6 May 2015 03:00:15 +0000 (13:00 +1000)]
Fix loading project settings

Incorrect conversion from the Variant to the String is fixed.

Change-Id: I082cdbeee1568d0b6b567232b50419d76572a197
Task-number: QTCREATORBUG-14404
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoShellCommand: Rename some signals
Tobias Hunger [Wed, 29 Apr 2015 10:50:12 +0000 (12:50 +0200)]
ShellCommand: Rename some signals

Rename the signals used to report stdout/stderr to make it clearer
what they actually do. Remove some unimplemented private member
functions while at it.

Change-Id: I7e856f906ccb45964f3b1b64336d4d8ebca7b9ee
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoC++ Dumper: Fix potential endless loop on invalid pointer
Orgad Shaneh [Mon, 4 May 2015 20:20:40 +0000 (23:20 +0300)]
C++ Dumper: Fix potential endless loop on invalid pointer

Change-Id: I554f2cd0b97c549767453ad3df290d93da483360
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoMerge remote-tracking branch 'origin/3.4'
Eike Ziller [Thu, 7 May 2015 12:42:46 +0000 (14:42 +0200)]
Merge remote-tracking branch 'origin/3.4'


Change-Id: I410156c1003d5dc81e915110c6d432bcd71da010

2 years agoValgrind: Use some initializer lists when appropriate
hjk [Wed, 18 Mar 2015 23:59:04 +0000 (00:59 +0100)]
Valgrind: Use some initializer lists when appropriate

Change-Id: Ic1988a3a046bf5a4c262d1e648376f077ed97448
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoRefactor CommandMappings to be a widget instead of options page
Eike Ziller [Mon, 27 Apr 2015 10:29:55 +0000 (12:29 +0200)]
Refactor CommandMappings to be a widget instead of options page

The IOptionsPage parts in it were trivial, and we need more flexibility
for the shortcut settings options pages.

Change-Id: I93ddaf060ac88ef339da9f542719f2d695660ac0
Reviewed-by: hjk <hjk@theqtcompany.com>
2 years agoDebugger: Fix attaching to running debug server
Eike Ziller [Thu, 7 May 2015 11:35:21 +0000 (13:35 +0200)]
Debugger: Fix attaching to running debug server

For example when developing on Windows, cross compiling to Linux, the
result is not executable from the Windows perspective.
Reverts f2cfd3c01a2876150aa7fdc0a44adee33029f2c9 which changed the code
to use ExistingCommand to get the automatic expansion of app bundles on
OS X, and do automatic expansion of app bundles also when using path
chooser of type File. Choosing an app bundle in a path chooser of type
File would previously lead to an invalid entry in the path chooser
anyhow, because the app bundle itself is not a file.

Change-Id: Ie710c47918d2b8735009e290301ed2683e354f2c
Task-number: QTCREATORBUG-14412
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoSubversionClient: Use Qt5 style connect
Tobias Hunger [Thu, 7 May 2015 12:16:15 +0000 (14:16 +0200)]
SubversionClient: Use Qt5 style connect

Change-Id: I88f1de02edcb6c4406de64745ccc4cfc85f3d562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoProjectExplorer: Fix to eager clearing of output window
Daniel Teske [Thu, 7 May 2015 10:59:01 +0000 (12:59 +0200)]
ProjectExplorer: Fix to eager clearing of output window

The window was cleared even if the option to clear it wasn't
selected. Moving the cursor to the end, has the side effect of
clearing the selection, so do that always.

Change-Id: I6b61981f46394c61e61066aa8033c7e3391e6c07
Task-number: QTCREATORBUG-14410
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoQbsProjectManager: Fix deriving qbs profile names from kit attributes.
Christian Kandeler [Thu, 7 May 2015 09:24:11 +0000 (11:24 +0200)]
QbsProjectManager: Fix deriving qbs profile names from kit attributes.

Turns out that using Id::uniqueIdentifier() is not deterministic across
invocations of Creator...

Change-Id: I8b78a5b36c2cd61e4b9c5d8cc8eb2c6083282c01
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoPathChooser: Use a std::function as callback
hjk [Thu, 30 Apr 2015 13:22:57 +0000 (15:22 +0200)]
PathChooser: Use a std::function as callback

... instead of a SLOT(...)

Change-Id: I32ed3ea014d1efde54bac2d5153f3083e37ef7ec
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoCPaster: Remove unneeded declaration
hjk [Mon, 27 Apr 2015 14:50:19 +0000 (16:50 +0200)]
CPaster: Remove unneeded declaration

Change-Id: Idba2af421e07f09b89392b490d0b2eb388553ec9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoGet rid of FancyLineEdit::validate
Eike Ziller [Tue, 28 Apr 2015 12:49:56 +0000 (14:49 +0200)]
Get rid of FancyLineEdit::validate

Use aggregation instead of inheritance for customization of validation.
Gets rid of a few additional classes.

Change-Id: Iaf8f12026c40a55bfde98b3786100f8ac431d750
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoCore: Remove some unused images
Tobias Hunger [Wed, 29 Apr 2015 09:12:14 +0000 (11:12 +0200)]
Core: Remove some unused images

Change-Id: I7bd688333eba40c798e5ba7ae094ee27bac977f4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoPersistentData: Allow for user types with suitable conversions
Daniel Teske [Thu, 23 Apr 2015 12:05:54 +0000 (14:05 +0200)]
PersistentData: Allow for user types with suitable conversions

I ended up not needing that, but this might be useful for others.

Change-Id: Ie3a5a731d9f3f3f456d7cd4164cfa1753e2b54f1
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoProjectTree::currentProject: Introduce a fall back to startupProject
Daniel Teske [Mon, 4 May 2015 14:47:47 +0000 (16:47 +0200)]
ProjectTree::currentProject: Introduce a fall back to startupProject

If no node is selected, e.g. no document is open, the ProjectTree
currently claims that there is no current project.

This adds a fallback to startup project in that case. This especially
fixes the case where only one project is open and as such it is clear
from context which project the user expects to be current.

Revert a few places where I implemented this fallback manually.

I do not like this. If multiple projects are open, this fallback can be
surprising and not what the user wants. Everything works fine in the
simple case with one project open but breaks with multiple projects
open, this actively hides bugs.

Change-Id: I6259834ca2220dd83bdffb16c3a0eac8f98e504b
Task-number: QTCREATORBUG-14394
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoEditor: Do not assign unknown style to text style.
David Schulz [Mon, 4 May 2015 07:40:41 +0000 (09:40 +0200)]
Editor: Do not assign unknown style to text style.

Just return the last style sentinel.

Change-Id: I2bd1a6e12913e0c208b11efae3baae87c183f39a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoFix Add Library for static libraries
Daniel Teske [Mon, 4 May 2015 09:25:38 +0000 (11:25 +0200)]
Fix Add Library for static libraries

Broke in 7481bff2b4a2e7391deac3dfdde0f33241a2e370 which split up
LibraryTemplate in SharedLibraryTemplate and StaticLibrary.

Change-Id: I797c007fff09ffd09b7744cf3543217b936dea12
Task-number: QTCREATORBUG-14382
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2 years agoRemove some workarounds for Qt bugs that have been fixed.
Christian Kandeler [Thu, 30 Apr 2015 09:21:28 +0000 (11:21 +0200)]
Remove some workarounds for Qt bugs that have been fixed.

Change-Id: I0e7112ee3f3790fba42fc882cb98e06ec6a2186d
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2 years agoClass view: Fix expanding of items on double click
Robert Loehning [Wed, 6 May 2015 09:34:46 +0000 (11:34 +0200)]
Class view: Fix expanding of items on double click

Task-number: QTCREATORBUG-2536
Change-Id: I94471c265c9f9dbffe253d7c6e8a1e834b47f91f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoCdbExt: Setting actively which nodes should be expanded.
David Schulz [Tue, 5 May 2015 10:24:33 +0000 (12:24 +0200)]
CdbExt: Setting actively which nodes should be expanded.

Change-Id: I1470a67aa559e4d93a01cc70701fb160e873317d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2 years agoDebugger: Fix GDB hanging
hjk [Thu, 30 Apr 2015 13:52:33 +0000 (15:52 +0200)]
Debugger: Fix GDB hanging

This partially reverts commit e33da6a6b3c1b85d7bb6e961a60803eaf71afce5.
GDB seems to hang while executing str(some_pointer) in some setups.

Task-number: QTCREATORBUG-14374
Change-Id: Ia678533b9122e505b21ef6659d404239995ddb81
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2 years agoPerforce: Ability to use multiple workspaces/projects
Cristian Adam [Tue, 5 May 2015 10:56:54 +0000 (12:56 +0200)]
Perforce: Ability to use multiple workspaces/projects

By the use of P4CONFIG (p4config.txt) one can now specify workspace
details (P4USER, P4CLIENT, P4PORT) individually for specific projects.

Previously one had to reconfigure Qt Creator in Settings for every
workspace switch.

Change-Id: I117829ab3cf592562a4662f85314aa3c125e7610
Task-number: QTCREATORBUG-14378
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoDevice support: Only restore SSH options if we really saved them.
Christian Kandeler [Tue, 5 May 2015 15:42:38 +0000 (17:42 +0200)]
Device support: Only restore SSH options if we really saved them.

As the default-constructed value is not zero. This was not considered in

Change-Id: I1f32b1c317e0de34b48dbe003c3968f66133a64d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoqbs build: Don't treat templates directories as artifacts.
Christian Kandeler [Tue, 5 May 2015 09:38:53 +0000 (11:38 +0200)]
qbs build: Don't treat templates directories as artifacts.

This dubious workaround is no longer necessary due to the new
qbs.installSourceBase property.

Change-Id: I352b82ddf445ea6e7d8f870769de805bf71e7dc4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2 years agoUpdate qbs submodule.
Christian Kandeler [Tue, 5 May 2015 08:23:45 +0000 (10:23 +0200)]
Update qbs submodule.

To HEAD of 1.4 branch.

Change-Id: I675cd578608380dbc20f67bdab0dbb414d605e08
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2 years agoC++: Fix highlighting of member on indirect specialization typedef
Orgad Shaneh [Mon, 4 May 2015 20:22:39 +0000 (23:22 +0300)]
C++: Fix highlighting of member on indirect specialization typedef

Missed a spot in ad4cb444fbfd1f3f4747a0988a196120d3a0c208

Task-number: QTCREATORBUG-14141
Change-Id: I1a6a25ce3e9c2a680e1b8eebec01a17749cdb026
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoCppEditor: Support qDebug() for OverrideItem in tests
Orgad Shaneh [Sat, 2 May 2015 18:19:46 +0000 (21:19 +0300)]
CppEditor: Support qDebug() for OverrideItem in tests

It is used in some comments but doesn't compile...

Change-Id: I5ba3afbe927c3b625218c0c2fee2c9ee6f53f4aa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoC++: Minor optimization in ResolveExpression
Orgad Shaneh [Mon, 4 May 2015 17:33:41 +0000 (20:33 +0300)]
C++: Minor optimization in ResolveExpression

Avoid needless snapshot copying

Change-Id: Iea38bd0866495cf5335b4444d5643d7082fbfcde
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoC++: Fix commented debug in preprocessor
Orgad Shaneh [Mon, 4 May 2015 17:12:32 +0000 (20:12 +0300)]
C++: Fix commented debug in preprocessor

included is QByteArray

Change-Id: I5ec6d68bd0bbcb2b08cdcfe2759d72f474d4cda4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoC++: Remove redundant assignment
Orgad Shaneh [Fri, 1 May 2015 08:19:50 +0000 (11:19 +0300)]
C++: Remove redundant assignment

TranslationUnit assigns itself to the control in its ctor.

Change-Id: I08cf70c32f557648709e29b03c2f939d294fdc6d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2 years agoVcs: Fix compilation for gcc 4.7.3
Christian Stenger [Tue, 5 May 2015 06:38:33 +0000 (08:38 +0200)]
Vcs: Fix compilation for gcc 4.7.3

Introduced with b5090ddde4235118802f6bcfb2588de41c7ed2a3

Change-Id: Iab60896cc27e9b9403c68aafe6fec9c4ed47b60d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoVcs: Split up VcsCommand
Tobias Hunger [Mon, 27 Apr 2015 13:03:07 +0000 (15:03 +0200)]
Vcs: Split up VcsCommand

Move the biggest chunk into Utils::ShellCommand, add some Qt Creator
specific magic in Core::ShellCommand and leave the rest in

Change-Id: I5fe6f7076e96023ad2164bcfaacfb3b65a7ff8a8
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2 years agoJsonWizard: Treat no visible page the same as no page at all
Tobias Hunger [Mon, 4 May 2015 12:32:21 +0000 (14:32 +0200)]
JsonWizard: Treat no visible page the same as no page at all

Just accept the dialog and try to generate files when no page is

Change-Id: I0ae9aa6c29e55f52f3edad35742869a0cc535521
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoVcs: Make VcsConfiguration page trigger on config changes
Tobias Hunger [Mon, 4 May 2015 12:20:11 +0000 (14:20 +0200)]
Vcs: Make VcsConfiguration page trigger on config changes

... when used with an vcsId instead of with an IVersionControl.

Change-Id: Id906db07165535d4f505c7696e29bb8b9026f840
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoJsonWizard: Remove error reporting when a key was not found
Tobias Hunger [Mon, 4 May 2015 09:37:51 +0000 (11:37 +0200)]
JsonWizard: Remove error reporting when a key was not found

Change-Id: Ic7066aa4ce1a8b2e584c825b5b013b9621c28010
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoQmlDesigner: Remove unused files
Tobias Hunger [Wed, 29 Apr 2015 09:13:32 +0000 (11:13 +0200)]
QmlDesigner: Remove unused files

Change-Id: I5038963f13ab82a58fddbf0dd95fa173d5f07424
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2 years agoDoc: update the Qt Quick application tutorial
Leena Miettinen [Mon, 4 May 2015 09:39:53 +0000 (11:39 +0200)]
Doc: update the Qt Quick application tutorial

To version 3.4, but still using the Qt Quick 2.1

Task-number: QTCREATORBUG-14341
Change-Id: Ifd9638ea5b111554f2ea7838623104aab27963a3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2 years agoSdktool: Add switch to set environment for kits.
Tobias Hunger [Thu, 30 Apr 2015 10:55:26 +0000 (12:55 +0200)]
Sdktool: Add switch to set environment for kits.

Use --env TEST=somevalue or --env TEST (to unset TEST) once per
environment variable you want to set/unset.

Task-number: QTCREATORBUG-14342
Change-Id: Ia968aeb55a9702d12bc0beb9a38bdd8309a18559
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoSdktool: Fix default kit handling
Tobias Hunger [Thu, 30 Apr 2015 10:54:48 +0000 (12:54 +0200)]
Sdktool: Fix default kit handling

The default kit is addressed by its id, not its number for a long
time now. Update sdktool accordingly.

Change-Id: Iad0d0c6eda2aa824fa8add99871db7efebb30e75
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2 years agoAdd missing qmake functions to profile completer
M. Moellney [Sun, 3 May 2015 21:54:30 +0000 (23:54 +0200)]
Add missing qmake functions to profile completer

A lot of qmake expand and test functions were missing from
the ProFileCompletionAssistProvider.

This patch brings the database on par with the listing in
the qmake build in functions from current qmakebuiltins.cpp.

Change-Id: I635776f6b449d62fd6a505969451e8630fb26ee8
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>