Commit Graph

26588 Commits

Author SHA1 Message Date
Nikolai Kosjar
efc96e402b C++: Fix regression not showing classes in completion.
Change-Id: I06b4289460d623da4b70d324d0cdf53ff7c972e7
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-20 09:40:02 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:57:35 +01:00
Lukas Holecek
f31da9ac55 fakevim: Show current command in minibuffer (showcmd option)
Use showcmd Vim option to show current partial command.

Removed unneeded updateMiniBuffer() calls.

Change-Id: Iddacd364b7c92882b6169a6894c89cdb202a32bf
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:29:37 +01:00
Tobias Hunger
7e57e81916 Add some more project related variables to the variable manager
Change-Id: Id81c3e9d0e813c603850a6018ebbe3444e829cce
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-19 14:51:57 +01:00
Przemyslaw Gorszkowski
70e3356a02 Refactoring LookupContext.h
Extracting class AlreadyConsideredClassContainer to separate file

Change-Id: If3bb89df5ce0bae87723ad4ecab7118337df0655
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-11-19 11:23:49 +01:00
David Schulz
eb39b57e24 Debugger: Dont use win64interrupt.exe in some case
If everything is built with 32 bitness there is no need
to call win64interrupt.exe

Task-number: QTCREATORBUG-7891

Change-Id: I1981b0dfd0ff08ff8acce0e5b81858b00f536ded
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-19 10:18:49 +01:00
Lukas Holecek
cd7c91d440 fakevim: Match same text with same regular expression
Match same text on same regex in forward and backward search modes.
E.g. with '\w\{2}' Vim regex and 'abc' text always match '<ab>c'
(should never match 'a<bc>' as with QTextDocument::find()).

Change-Id: Ie920c76540f3be426fc7b842d38137e95c1a65b2
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-19 08:54:10 +01:00
hjk
c3ce444c8e debugger: add dumper for QStringRef
Change-Id: I6a3b732de5b2741ba2f19f012dd59373ce94377c
Reviewed-by: Bojan Petrovic <bojan85@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-18 00:21:09 +01:00
hjk
0a5f0ba5af debugger: don't limit strings when "displayed"
Change-Id: I156f66f93deaa818d4409b2a02f0b2e046373656
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-17 18:57:52 +01:00
Daniel Teske
3d825fca0a BuildManager: Remove unused member variable m_projectExplorerPlugin
Change-Id: Ib2b5d73916b9f741a5080b91f35f64aca5feb2bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-17 09:22:53 +01:00
Tobias Hunger
8a09d2ff34 Fix build - rebase introduced an issue:(
Change-Id: I71c9326e39fdc6777ce2eebbcb4f347c7b607ff6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-17 09:22:27 +01:00
Tobias Hunger
0334bc93bf Session: Save color as part of the session
This makes it much easier to see which session you are in (if you care
to use color-coding;-).

Change-Id: I96d55aa9a67fc44cb88797458d5a9e99208b957c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-17 08:31:44 +01:00
Tobias Hunger
f50f1416a1 MIME: Delay resolution of mime types aliases
A MIME type can declare itself a sub-type of any other type. That
may be an alias of some type not yet registered, so delay alias
resolution till all MIME types are registered.

Change-Id: Ie944771287f83e5439b120d12bed550266a6c954
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-11-17 00:08:05 +01:00
Ryan May
9884a76879 Add processing for array types to a standalone dumper.
This way, it can be overridden to make a custom dumper for an array of
data (such as creating an image display).

Change-Id: I0fda56872293554c6235e24f9af467c82f0b0f21
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 23:57:47 +01:00
Lukas Holecek
29c448edb1 fakevim: Methods for handling input in sub-modes
Code from handleCommandMode*() was moved to separate handle*SubMode()
methods. The common code is in handleCommandMode() which is called on
user input in command mode. This method additionally handles clearing
flags for command submodes.

Method handleMovement() handles movement input. This method is called if
no command is active (from handleNoSubMode()) or if current incomplete
command can be followed by movement (finishMovement() is called to
finalize the command).

Unneeded finishMovement() calls were removed.

Change-Id: Ib5ca5b6ec252224eee3285680572fb9fcefd0d46
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 17:30:50 +01:00
hjk
d452da17a7 DetailsWidget: make cacheBackground public
Change-Id: Ib3725298f77f8ea878717e31bffceffc8bf1f7c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-16 16:34:07 +01:00
hjk
5dfdf75efc KitManager: spacing in dialog
Change-Id: I243de278cd964c9aa51e7ff091a2c33e8043a562
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-16 16:33:50 +01:00
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
2012-11-16 15:31:02 +01:00
hjk
5981b1e550 ProjectExplorer: handle environment files with non-latin contents
Task-number: QTCREATORBUG-8265
Change-Id: Idc69b8d886b8162fbe38e340b9794e9ffca4ad79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-11-16 15:29:55 +01:00
Tobias Hunger
0a6b47a737 Fix detection of post-beta2 Qt5 versions
Change-Id: Ie85c5d2bbcc7ee35a343e0bc306e446d103a5925
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-16 15:13:06 +01:00
Daniel Teske
51bca85117 Replace BuildConfigWidge with NamedWidget
They have a identical interface.

Change-Id: Ia626496fbaffedefff6ee20b958cd505085d89f7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:26 +01:00
Daniel Teske
ea640a5aea BuildConfigWidget derived classes: Add missing tr()
Change-Id: I1861400c4d50191ed2fd2eba7c28f72628236f12
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:21 +01:00
Daniel Teske
3ef968097f BuildConfigWidget: Make displayName property instead of a virtual func
To make the interface the same as NamedWidget.

Change-Id: I5961b4e5aa7f5acf3a7f83e82b6fa4266b9ebf97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:16 +01:00
Daniel Teske
b5bbdb38d9 Remove BuildConfigWidget::init()
It no longer serves a purpose.

Change-Id: Icdcb69c87112e295cefd4975dfa2b3d65818365a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:09 +01:00
Eike Ziller
8cbafa83b6 Mac: Fix running Qt applications
The executable was not resolved to the app bundle, broke with
95169eb8e3

Task-number: QTCREATORBUG-8271
Change-Id: I374cb6f3935878db4d30c944ce56ad424e4e250b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-16 14:41:55 +01:00
Daniel Teske
2e01cd2c05 BuildSettingsWidget: Recreate BuildConfigWidgets per BuildConfiguration
Currently the BuildConfigWidgets are created once and init(bc) is
called on switching BuildConfigurations. That's odd since the
createCongigWidget() function is on the BuildConfiguration and not
the project. Recreating the widgets on switching bcs does introduce
some flickering and collapses the BuildEnvironmentWidget, but that's
a minor regression.

Change-Id: I0672655c8796741fc5ddaba9768817fe2951c335
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:37 +01:00
Daniel Teske
241f36f89d BuildConfiugration: Rename subConfigWidgets to createSubConfigWidgets
Indicating that new widgets are indeed created.

Change-Id: Iccc5e1e99f536fdfb0718f252a23f498053ad3a3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:18 +01:00
Daniel Teske
613f3345e1 BuildConfiugration::subConfigWidge() Provide a default implementation
Which simply returns a BuildEnvironmentWidget. A long time ago
BuildConfigurations had no environment, nowdays they do. So it makes
sense for all BuildConfigurations to have the BuildEnvironmentWidget.

Change-Id: I824c45df79a0dcd2b624bf67a4730fb5dab098bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:10 +01:00
Daniel Teske
e08b38ffd6 Move Project::subConfigWidgets to BuildConfiguration
Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:00 +01:00
Daniel Teske
36718cae2c DeployConfigurationWidget: Remove class
It is the same as NamedWidget. If we need to add additional
functionality then we can always reintroduce the class.

Change-Id: I684b5215e732e480e4e73e4cac3753bb92afd0d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:55 +01:00
Daniel Teske
d4e2db845d Remove DeployConfigurationWidget::init()
It serves no purpose.

Change-Id: Ic9d802aa2b46aae567c5a84d199d37564c69f7ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:47 +01:00
Daniel Teske
058ca549c4 Rename DeployConfiguration::configurationWidget()
To createConfigWidget(). Which indicates that a new widget is created
and makes it the same name as BuildStep/BuildConfiguration

Change-Id: Ib1858bc5382556ebb9a8a474fa79f0e7e9593cf7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:39 +01:00
Daniel Teske
0192dd6ddc MaemoCopyToSysrootStep: Remove check for Qt4BuildConfiguration
Only needs BuildConfiguration

Change-Id: I3ae459120f7f8219b5c7fb13b967509044652010
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:30 +01:00
Daniel Teske
e1ed7ec151 GenericMakeStep: Remove genericBuildConfiguration()
None of the callers needed anything beyond BuildConfiguration

Change-Id: I4d8a9c6deb433b2003727fead9de5defa83cf3e9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:25 +01:00
Daniel Teske
cfadfd6f3f CMakeProjectManager MakeStep: Slightly reduce dependency on CMakeBC
Change-Id: I2fee3e4ed1c217e16e3389610b01ee8a1f9604f7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:18 +01:00
Daniel Teske
3d9ce0f687 Remove autotoolsBuildConfiguration() from all steps
All of the steps are just using standard buildconfiguration methods.

Change-Id: Ibdef14e0e845e0bfc8828922a985070665e5f172
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:10 +01:00
Daniel Teske
4e93ce81a8 Slim down BlackBerryDeployConfiguration
Change-Id: I24c6041fed850523135bc42a9cff768228046a80
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:03 +01:00
Daniel Teske
f36d3aca39 AndroidPackageCreationStep: Remove unused fwd declaration of Qt4BC
Change-Id: I2bfb9d46198c2829b7b19ab26e14099626404f89
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:38:45 +01:00
Daniel Teske
120b923edb Remove target from AndroidManager::openXmlFile()
It's no longer used.

Change-Id: I0256b76c2b007dd841aad51dae12602d9d7b3eb8
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:38:04 +01:00
Daniel Teske
e0c9d9dd51 Remove createAndroidTemplates from AndroidManager::openXmlFile()
The default value is false, and all the callers that pass in a 4th
parameter, pass in false.

Change-Id: Ifff6fb138b4cdd1d249c25246c623335dd96dcc5
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:37:58 +01:00
Orgad Shaneh
80b5a427aa Do not warn when opening a pro.user file without EnvId
Change-Id: I8884a444f148d22391f2a5b0fc16dd9fc3c832a7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:13:19 +01:00
Orgad Shaneh
3f44c6d0be ClearCase: Fix race condition
setStatus() is invoked in the main thread, but the
status change is tested for in the sync thread...

Change-Id: Ib322e12e7d40dafa6b60f3a73a202e8e1dcbfb53
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:13:14 +01:00
Orgad Shaneh
691ade1747 ClearCase: Fix "Check In Activity"
Change-Id: I69a416b8e3366c2054e3d0208a5eb50b82f4c597
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:13:00 +01:00
Orgad Shaneh
3e9f2d688c Git: Suggest continuing rebase after conflicts are resolved
Change-Id: Icf74397ee7a3cedd7e46c63777832e1fc9f46033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:12:47 +01:00
Orgad Shaneh
099345d110 Git: Suggest running mergetool if pull fails
Change-Id: Ic2fe525ea9e63a5ecdd1ab23dc07ede810aa192e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:12:41 +01:00
Orgad Shaneh
7ba0433b2b Git: Write mergetool input/output to VCS output window
Change-Id: I75fdf1535da610e6300c76a0b11b3ae032899484
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:12:11 +01:00
Orgad Shaneh
89ae89195d ClearCase: Report current view
Change-Id: I1082ccdf7e38f9c8e03f713b3f3244a48d8eb523
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:11:32 +01:00
Mathias Hasselmann
c9b45c0d61 Git: Report current branch
Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:11:24 +01:00
Mathias Hasselmann
fd6d0d8c29 ProjectExplorer: Show VCS topic in tree
Topic is usually the current branch name

Change-Id: Id6ecc48744a5b3d9c7502b36b4895eb18d0ff0c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:11:08 +01:00
hjk
3685ce7599 debugger: make string cutoff value configurable
Change-Id: I118016956a597ad689daa438f5517a47efe3cef0
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-16 13:59:47 +01:00