Commit Graph

32962 Commits

Author SHA1 Message Date
David Schulz
4b51064b45 Editor: Don't change the focus when setting a new view.
Move the focus logic to activateView. Use activateView
when it makes sense.

Change-Id: I79ad11eea629fc1aaa194ecdd8995f5965d1b806
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-28 12:52:59 +00:00
Christian Kandeler
0d86ea4a1c Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I1ec44fb51dc18bb9e72e10c1c5811ef52ffdc363
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-01-28 12:46:46 +00:00
Orgad Shaneh
97d957e3e3 Utils: Introduce FileName::fileName()
* Replacement for QFileInfo::fileName()
* Supports additional path components

Change-Id: I2b3e3dfb02617c8f98f1d67e16396bed97f97526
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-28 11:42:41 +00:00
Christian Kandeler
e7a18108e1 CppTools: Fix macro collection.
"#define XYZ" does not correspond to "-DXYZ" (which means
"#define XYZ 1"), but to "-DXYZ=".

Change-Id: I3ed44e1457b3df52dc9bdb930ba8f4a04784d207
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-27 15:25:23 +00:00
Tobias Hunger
56637a5d25 GitClient: Use Qt5 style connects
Change-Id: Idc7d5d2a52627d8a328c28863bb99174ad0154e5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-27 14:52:45 +00:00
Daniel Teske
e57ed31c33 Android: Replace setting for input .json file and use active rc instead
That's a more natural approach to select the application .pro file

Task-number: QTCREATORBUG-13732
Change-Id: I8c6745bea4b408e1d4f7ed2cd4e1d50798c60881
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-27 14:32:23 +00:00
Tobias Hunger
2477df97fe GitEditor: WS only fix
Change-Id: I7426b8d0c09edaa7e2eb7ce58d0cec58e6e90da7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-27 14:23:22 +00:00
Tobias Hunger
99c03c0e68 SVN: Fix warning raised by clang
Change-Id: I95805056160c17030af4d81792c05c48e95da84f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-27 14:21:40 +00:00
Christian Stenger
512055d36d Debugger: Fix context menu item text
As it is possible to delete more than one selected breakpoint it
should be indicated in the menu.

Change-Id: Iabf6d4313e65bb65d7e822b05f448f459a7ae3a5
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-01-27 14:13:37 +00:00
Eike Ziller
f064dd1b27 Extract a fading indicator widget into utils
That can show either a pixmap, or some text.
Used for the wrap indicator when searching, and for the 'presentation
mode' of action manager.

Change-Id: I4d603fb5750d7539c50de7ef8fd6c8545293d5b9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-27 13:48:26 +00:00
hjk
f2cfd3c01a Debugger: Allow app bundles in 'Start and Debug External...'
Change-Id: I04274e8e52d3447166382b881c0a014e1d3ef70b
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-27 09:27:40 +00:00
hjk
31fecb0820 TreeModel: Add more item functions
canFetchMore/fetchMore, and insertChild (at given position). Make
prepend/appendChild use the latter.

Change-Id: I4162fe6e64f37d26de209aa81894c9730957694b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-26 22:09:11 +01:00
Nikolai Kosjar
93e82d731e CppEditor: Move CppEditorOutline to CppTools
Change-Id: I75768f548f8f914e76fbdeaf3c318c207782fe1b
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-01-26 18:15:29 +01:00
Nikolai Kosjar
21e50b2fde CppEditor: Make CppEditorOutline independent of CppEditor plugin
Change-Id: I1cafcd8daf93ffc2f672bf7e2ba5d1c8ea5e8652
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-01-26 18:15:25 +01:00
Nikolai Kosjar
db57fa8948 CppEditor: Make CppEditorOutline independent of CppEditorWidget
This enables us to move CppEditorOutline easier to CppTools, from where
it could be subclassed by the ClangCodeModel plugin.

Note that there is still the dependency to cppeditorplugin.h (setting
sortedOutline).

Change-Id: Ie595fb19d58be1c4339498a2dce9b97097867490
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-01-26 18:15:18 +01:00
Nikolai Kosjar
cfd3b56187 CppEditor: Move CppEditorWidget::linkToSymbol to CppTools
* Cuts direct dependency to CPlusPlus from cppeditor.h, but
  cppfunctiondecldeflink.h still pulls it in.

* Cuts direct dependency to
  cppeditor.h from cppvirtualfunctionassistprovider.cpp, but it still
  depends on cppeditorconstants.h.

* Cuts direct dependency to cppeditor.h from cppelementevaluator.cpp.

The long-term goal is to make the CppEditor independent from concrete
code model backends.

Change-Id: I291ee0d0da5fc5ed1a839a763fe7be11dcf7a6fb
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-01-26 18:15:10 +01:00
Lorenz Haas
f08266497e CppEditor: Add new QuickFix MoveAllFuncDefOutside
This QuickFix behaves like MoveFuncDefOutside except it moves all
member function definitions. It is triggered on the class name.

Change-Id: I1393a51cad521a7bb58a1ed6223ab0fe4db0e592
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-26 17:52:40 +01:00
Lorenz Haas
e58b326a29 CppEditor: Fix AssignToLocalVariable
Make calls like a->b()->c() assignable to a local variable.

Task-number: QTCREATORBUG-10355
Change-Id: If4a55b435c99150710d00567188f901acb2c1a89
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-26 17:52:18 +01:00
Hugues Delorme
ba8c7c91d0 Svn: add "Verbose" option for log command
Change-Id: If58a98ff45ceba251c6972099d38d2ce506422c9
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-26 17:49:43 +01:00
Christian Kandeler
ea1efad6f1 CppTools: Support MSVC in CompilerOptionsBuilder.
Needed for clang static analyzer.

Change-Id: I0221b7e87f7b52a4aa5ebf7f4b26c19e584d63e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-01-26 17:01:40 +01:00
Eike Ziller
f5a3c7cf17 EditorView/Placeholder: Avoid huge text on some systems
Change-Id: I80456b0c861feb670caec7cca26e0bc9b1516766
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-26 16:33:54 +01:00
Hugues Delorme
520c16b448 Svn: move common constants in subversionconstants.h
Change-Id: Ib97a2ee90a4ed4dc2740654f1e210f4dcc9579cf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-26 14:59:56 +01:00
Yuchen Deng
e4b48265ff Welcome: fix qbs build
Change-Id: Iaf0b2e8e53f58dbc753b9681538c60824f8a67b9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-26 14:50:14 +01:00
hjk
787b4455c7 Debugger: Modernize lldbengine.cpp
Change-Id: I4d2c7b51cc4beb3edebf6995df1ce269f9c2c8db
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-26 13:39:36 +01:00
Nikolai Kosjar
4e05b073eb Debugger: Fix compilation with MSVC2013
Change-Id: I7c40720ab426bcb5743cc4bccf656e54b7d8a45a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-01-26 12:35:36 +01:00
Tobias Hunger
94f1196cc3 ClearCase: WS-only change
Change-Id: I9ce7debe597776a709098935b2289df8accca54a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-26 11:55:07 +01:00
Tobias Hunger
6d035df0d5 SynchronousProcess: WS-only change
Change-Id: If4cf8d48b4176590968d170776f4ecd186b4a3ec
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-26 11:54:55 +01:00
Nikolai Kosjar
51219a8815 {Qbs,QMake}ProjectManager: Make executable selectable/copyable
Change-Id: I7947ec85173f0898d54333f174fa6c14bcb051d6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-26 10:07:34 +01:00
hjk
3c8a8eb8e8 Debugger: Introduce a pty based channel to inferiors
This is experimental for now and requires QTC_USE_PTY=1
in the environment to be used.

Change-Id: I460ce7b9283467d481e903f731f4243b7e5ec094
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-26 09:43:19 +01:00
hjk
4ea0138423 Debugger: Replace gnuplot by python-matplotlib for graph dumper
Better functionality and availability than the gnuplot version.
The feature ("Show array-like data in external plot window")
will be automatically enabled if 'from matplotlib import pyplot'
succeeds.

Change-Id: I1799534ac5f878d3e43e47289d1b563b52bb4378
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-26 09:14:08 +01:00
hjk
4c928f6099 Debugger: Disable GDB's own pretty printers when use is not wanted
Saves up to 20% on large uniform structures.

Change-Id: I98c8c942f0accac7e2db1d8b06bf7ed156967306
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-01-26 09:13:53 +01:00
Tobias Hunger
94a6a7e5c9 LocalApplicationRunControl: De-noise a bit
Change-Id: If4e5eebea2502bba3a85b8f8f87a9a81514f4fb5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-23 18:24:41 +01:00
Christian Kandeler
3d3f96c4c6 Update qbs submodule.
To HEAD of master branch.

Change-Id: If31681b614f0d80ed90a053b1b686823bf902291
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-23 16:57:28 +01:00
Christian Kandeler
52f45f307b Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: Id9c9635edeec3a3bff145087f5e296f1141fc202
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-01-23 16:39:51 +01:00
BogDan Vatra
f23a5fc41d Set QML[2]_IMPORT_PATH evn variable when running qml[2]puppet
qml[2]puppet can't use any QML plugin that are defined in your .pro file
(using QML_IMPORT_PATH) unless we don't specify it.

Change-Id: I0fffb8a5da1023565fa9fce5cd4cf38f098a0df1
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-01-23 16:28:05 +01:00
Daniel Teske
2b4cf4bf97 CreateAndroidWizardTemplates: Fix wizard for subdirs project
Preselect the node of the current runconfigration, actually display the
path to the selected runconfiguration as the defailt and correct the
path that we write into the .pro file.

Change-Id: I45ad798573f1b0cd29c5ecdc2d951f7b07f7bd3c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-23 14:47:19 +01:00
Daniel Teske
3fe525f265 Android: Fix building packages
Accidental logic error in 21a5766cee

Change-Id: I3eca9a5ebfecb9846051142bd54b30962472b740
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-23 13:26:53 +01:00
Mitch Curtis
dd2bf5d602 Add IsoIconsVar to QmakeProjectManager::QmakeVariable.
It uses "ISO_ICONS" as its variable name.

This is necessary for the ISO Icon Browser Plugin. A previous attempt
at adding a more generic API to QmakeProFileNode that would allow for
reading and writing custom qmake variables was not sufficient. This is
because qtquickdesigner plugins do not get created until design mode
is entered, meaning that it was too late to register custom qmake
variables via static functions in QmakeProFileNode.

Change-Id: I2c8e0d944a1b9f07d1a7a70bd5e02ea371cf7680
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-23 12:55:03 +01:00
Daniel Teske
955ce2169f QmakeProject: Use file list even in the EvalPartial case
EvalPartial is if the exact parse didn't work out at all, but the
cumulative did.

Task-number: QTCREATORBUG-13871
Change-Id: I98f6389783d15b156e56dc8be7d388b2951d9bdf
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-01-23 12:23:58 +01:00
Nikolai Kosjar
56dab9e931 C++: Check for cycled parents
In the struct _Wrap_alloc (see test code) the rebind struct has
_Wrap_alloc as parent. However, within rebind the typedef of type
_Wrap_alloc has rebind as parent.

We will refactor that in master by introducing a "parent iterator"
class checking for cycles, so the client code looks less noisy.

Task-number: QTCREATORBUG-13703
Change-Id: I7b6cf819ea869139d2403e15ba085d8fba19763e
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-23 11:41:36 +01:00
Nikolai Kosjar
4a397a5ff5 CppEditor: Tests: Make AddIncludeForUndefinedIdentifier tests data driven
...as far as possible.

Change-Id: Ida039df7fbd4f1a9fce354dd8541c32255752082
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-01-23 11:36:03 +01:00
Orgad Shaneh
446345091b QmlDesigner: Reset debug flag
Change-Id: I1c6e904f613c187b6f7a2098597a152c4033d701
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-01-23 11:21:39 +01:00
BogDan Vatra
309d38c8f0 Sort the possible import list.
Change-Id: Iaa77273ebaf0867119f06c6ee3c2d29a61168933
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-01-23 11:07:13 +01:00
Thomas Hartmann
7af11ebaf9 Fix for import management
If we add a new import we have to scan for new item library entries
in the directory belonging to the import.

Without this patch e.g. the commercial controls were not added
to the item library. The user had to switch to edit mode and back
to trigger and update.

Change-Id: Ie145aea53fbd57ffac976725b6c1fd5553ddf22e
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-01-23 10:28:41 +01:00
Eike Ziller
b85229f372 Rename SettingsPage -> LocatorSettingsPage
Change-Id: I05ed009c597032ab1242ca2d69d7b0f7bd6da558
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-23 09:06:20 +01:00
Eike Ziller
e57bb77360 ProjectExplorer: Remove unnecessary dd->
Change-Id: If53a0c4d2b0e34a724ffeac1c3e489fb1240d176
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-01-23 09:00:34 +01:00
Eike Ziller
17ac107d71 Utils: Move source & header from utils.pro to utils-lib.pri
Change-Id: I4d473950a1352c07b0f35bc84475a3364336eeda
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-01-22 16:28:25 +01:00
Tobias Hunger
9f6e8aa921 VcsBase: Fix build
... broken by the last build fix:-( Sometimes you should just wait
for the build to finish before rushing out a build fix, even if
it seemed trivial.

Change-Id: Ifaaf962b289e6131fb9cfd4820e2582ace7a3972
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-22 16:10:28 +01:00
Tobias Hunger
d20833364a VcsBaseClient: Fix build on windows
Windows does pick ::log in favor of this->log in the lambda.

Change-Id: Ib3037606dfe70de955b10e69e2bc513b99b82fca
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-22 16:03:22 +01:00
Hugues Delorme
4e60001f83 Vcs: fix potential issue in VcsBaseEditor::getTitleId()
In case the input list of filenames contains only empty item(s) then getTitleId()
fails to return a valid result.
It should return the workingDir or the revision.

Change-Id: I697826446037e4b1e9f94c4c0c558336f8d44237
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-01-22 15:43:40 +01:00