Commit Graph

31523 Commits

Author SHA1 Message Date
jkobus
24ccd50015 Add a toolbutton for switching diff view mode
Task-number: QTCREATORBUG-10035

Change-Id: I83cb7cec3f4ba484ab068f398a12096501017668
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:21:31 +02:00
hjk
8749eee578 PluginManager: Clean up interface a bit
Change-Id: I6ce4443115c359c2c9588ffa615d13c29c249df2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:18:22 +02:00
hjk
0ed9b97a1f QtVersionManager et al: Code cosmetics
Apply static 'pattern' for QtVersionManager, de-noise using code.

Change-Id: Id66ac90094cd7312d1e72abbdbce4c02b078456e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:54:16 +02:00
Christian Kandeler
32d98862e7 Debugger: Fix argument placeholder in string.
Change-Id: Ie22bc9f4b4b26099d2b9af07379629b2ec31c469
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-30 10:49:18 +02:00
Orgad Shaneh
47b01acd32 Git: Some cleanup for branches on show
* Suppress command logging
* If no branches are found, do not add "Branches:" line

Change-Id: Id32b5f429a5c0324ec9e6d9d016f47160e9e5012
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:42:38 +02:00
Orgad Shaneh
35fce3c2ad Move VCS topic next to file name
If no file is open, show it next to session/project name

New format is:
* foo.cpp [master] - session - Qt Creator
* session [master] - Qt Creator

Change-Id: I9945396ffadbffa8fca4b397dda33cfa54131997
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:42:24 +02:00
Orgad Shaneh
860584c17d QbsPM: Use environment QBS_{SOURCE|BUILD}_DIR in qmake project
Change-Id: I05bf910682effe3ef6e468a891f8e9e96f5827bd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:39:38 +02:00
David Schulz
78a75b8e89 CPPEditor: Remove unneeded code.
Change-Id: I7f0263e461f5d03cd7ccde47ebbeaabad8d11c6d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-30 10:34:25 +02:00
Orgad Shaneh
f2e4b2b9c8 VCS: Invert Command -> runVcs dependency
* Unclutter runVcs
* Enable more dynamic signal/slot usage in Command

Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 10:11:56 +02:00
hjk
80194f4ef4 Debugger: Fix compilation with Qt versions < 5.2
Looks like not everyone updated yet...

Change-Id: Id0abe512ba22738953ead288edd84b3778fc170d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-08-29 18:27:58 +02:00
Christian Kandeler
bd6c1c4f55 Fix qbs build.
Change-Id: I79d6be0211ae1da543140db397a9ebe4e6cab6b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-08-29 17:55:56 +02:00
Paul Olav Tvete
db78293e7f Generic Android error messages
We want to give better feedback for installation problems and
other issues. There may still be undiscovered ways to mess up the
creator configuration, and we might find them after the string
freeze.

This adds a number of strings that we can use later.
We can add new error codes after the string freeze (and even in
patch releases). This means that even if we can't give people
detailed help for their problem in the UI, at least we give them
a googleable string.

We can then add better messages for the new errors in the next minor
release.

Change-Id: Ida7921fce5142d55144b0ba022de04726872187a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-29 17:07:32 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:45:25 +02:00
hjk
c10ae974eb KitInformation: Make dataId and priority value members
More in line with recent development.

Change-Id: I38ad7dd0cb96080a9dc9cc3165e4fb7c78a736b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:26:02 +02:00
hjk
36227d5c3a ProjectExplorer: Introduce per-kit debugger configuration page
Change-Id: I65c76f3ff43e1479075926c7e3fa460cca74d8fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:12:08 +02:00
Friedemann Kleint
c90df2b35b Reduce usage of QStringRef::toString() in settings reader.
Change-Id: Ie66432caa250eb3122739b38b5b0a02c66942cc3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:01:49 +02:00
Christian Stenger
2a2ecdc323 Squish: Prepare enabling Qt5 for suite_qtquick
Change-Id: I7c4ac62be8f30867953f776ad56ab3ffbf6cd909
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:11:01 +02:00
Christian Stenger
2665eced9b Squish: Move common function to shared script
Change-Id: I59d341f9f7a5c86bc3b723dbdc1e1596d464c92c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:10:45 +02:00
Christian Stenger
cdf8407d67 Squish: Fix determination of available targets
Change-Id: Iff01b44058dd9175aacfb0a0da96f35fb32383e7
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:10:32 +02:00
Christian Stenger
4fc9302c56 Squish: Move common code to shared file
Change-Id: I5e268d6faf9a2a5a779e850667c582328c42387d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:10:14 +02:00
Christian Stenger
4c0778786b Squish: Build Qml debug lib only if necessary
Change-Id: I90cf1f9e57d39211ea151b1cfc52e27f4ecaf654
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-08-29 15:09:58 +02:00
Thomas Hartmann
c4babe8c43 QmlDesigner: crash fix
The assert is wrong. We check the currentModel from QmlDesignerPlugin::hideDesigner()
and it can be null in case of a .ui/.qbs file.

Change-Id: Ifffa168f81bade757cc8d800150e4411c09915e7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-29 14:34:56 +02:00
Christian Stenger
5bcce3d131 Compile fix
Change-Id: I081f816a14d2a823dac87ba064be2b2c00ecd319
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 14:20:50 +02:00
Friedemann Kleint
4d11977bb7 Reduce usage of QStringRef::toString() in the QML profiler.
Change-Id: Id246bea7c21c61c87d02e3a839b44617e24d58fc
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-29 13:45:34 +02:00
Friedemann Kleint
e81f0e25de Reduce usage of QStringRef::toString() in cppcodeformatter.cpp.
Change-Id: Iff4634c3bd3829d236e3dd38e4d29ced5f118db6
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-08-29 13:07:37 +02:00
Thomas Hartmann
59c49d5336 QmlDesigner: adding check for null pointer
Better save then sorry.

Change-Id: Ica022c37be8beab0d99a9c1aaf2d5fa15d7141e6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-29 12:52:47 +02:00
Friedemann Kleint
bf5e8dc0e7 Reduce usage of QStringRef::toString() in the core plugin.
Change-Id: Ic3e2c16f5345012b8c6654929deb74f753e3ec8f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 12:27:24 +02:00
Friedemann Kleint
84cfc4f914 Reduce usage of QStringRef::toString() in project manager/cmake.
Change-Id: I5d60c663d8a258334dde9b93b4f76a4bea760a70
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-29 11:49:50 +02:00
Friedemann Kleint
e43e466b5b Reduce usage of QStringRef::toString() in QmlJS/QmlJSTools.
Change-Id: I9db2a0b21bf430d6f450e1e860a0c2a02272536f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-08-29 11:35:41 +02:00
Friedemann Kleint
0c621dcdcf Reduce usage of QStringRef::toString() in debuggertooltipmanager.cpp.
Change-Id: I5236df01aec5a5a173ea81d50330f0255603acad
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 11:19:00 +02:00
Friedemann Kleint
09be44a782 Reduce usage of QStringRef::toString() in texttomodelmerger.cpp.
Change-Id: I2c42e714d916696cfa1e16575665ee48a42dccac
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-29 11:17:26 +02:00
hluk
41785890d6 FakeVim: Escape '>' character in mappings
On some keyboards, '>' character can be produced using Shift key. But
recorded macro shouldn't contain '<S->>', which cannot be properly
parsed, instead it will be '<S-<GT>>' (as '<LT>' for '<').

Change-Id: Iac3759029b6ff8c9e690c4728e35048c0b6046f9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 11:10:36 +02:00
Orgad Shaneh
a60cf5d0fa Git: Use default show format for diff viewer
The widget is quite small, no reason to load it with
(normally useless) data

Change-Id: I092233124505f64d05a49d9da6463b64bbb398bb
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 10:57:18 +02:00
jkobus
33a7952745 Implement syntax highlighting in diff editor
All Qt Creator's main highlighters are used in the first place,
for other mimetypes generic highlighter is used as a fallback.

Task-number: QTCREATORBUG-9580

Change-Id: I863b9085520e5bdda142ce88f2074afeacee0531
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-08-29 08:54:04 +02:00
Nikolai Kosjar
a06da47d5b Locator: Allow to filter for path in BaseFileFilter
If the input contains a path separator, the input is matched against the
file path. Otherwise, as before, the input is matched against the file
name.

This affects AllProjectsFilter, CurrentProjectFilter and
DirectoryFilter.

Usage Examples:
    "src/*main.cpp"
    "cppedtior/"

Change-Id: I8bc55642b388a8f8e1d7a949f80bbe1abc41ae3c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-29 08:27:53 +02:00
hjk
853fcf3c43 Debugger: Auto-test compile fix with Qt 4
Change-Id: I414e829214a6e2e306998230aafde1a75c0af857
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-08-28 16:16:48 +02:00
Friedemann Kleint
e86ef45aaa Fix compilation with Qt 4.
Change-Id: I9217eb6695b9e48579f66b7fd8709c84806ffb66
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 16:08:02 +02:00
Daniel Teske
31fe6f069c Android: Use minimum sdk instead of build target sdk to filter devices
Task-number: QTCREATORBUG-9662
Change-Id: I3a5b3493bc8ef48bd23d014e86eef45185f3c17e
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:44 +02:00
Daniel Teske
307aa7b3aa Rename AndroidManager::targetSDK to buildTargetSDK
There are 3 different sdk settings:
- The minimum sdk setting from the AndroidManifest.xml
- The target sdk setting from the AndroidManifest.xml
- The target sdk setting from the project.properties file

The last one is now called buildTargetSDK, since it only affects the
build.

Change-Id: I373d925a45088ff0cf8a8e0b22cf9744e571eeb1
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 16:05:35 +02:00
Marco Bubke
1fee440e72 QmlDesigner: Remove unused AnchorLine
Change-Id: If8b8656f821ef5b5e25a37e020ead7f9c1e15ff9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-08-28 15:54:17 +02:00
Friedemann Kleint
6e31975313 Use QStringRef in parsing plugin-specs.
Avoid unnecessary string allocations, fix error reporting
which would pass PluginSpec::name instead of element to the
error message.

Task-number: QTCREATORBUG-9002
Change-Id: I0d136ef27f4226e1ba79e74ddab6b63cf0f20c74
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-28 15:25:19 +02:00
Daniel Teske
3c2facab5f Android Manifest Editor: Add support for minimum and target sdk settings
Task-number: QTCREATORBUG-9692

Change-Id: Ide85392d86e7f3df4df9644f01d186ed939f5124
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:06:25 +02:00
Daniel Teske
211e56b5b7 Android: Detect "unauthorized" devices.
For now just show that in the compile output.

Change-Id: I332a8cae5653155175abfb1a4877ca1ca7cce8d5
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 15:00:45 +02:00
Daniel Teske
de1af231e9 Compile
Change-Id: I39c69bace0926e381b3569818401ddda8dd2c986
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 15:00:29 +02:00
Daniel Teske
1c633eb1e9 Android: Connected devices should list all devices
E. g. waitForAvd needs all devices to correctly work.

Change-Id: I1b704e85bd7449d4c45ed36be48973f39148b8c4
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-08-28 14:54:56 +02:00
Daniel Teske
9d0ae5beee AndroidQtVersion: Call base class parseMkSpec
Change-Id: I8c9ca6cc61b49e5f5a437b95ac63a90ac0ee7667
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-08-28 14:45:01 +02:00
Tobias Hunger
6f991d362e QtKitConfigWidget: Do not warn when invalid Qt versions are changed
Change-Id: I7f571f360dbe2306f613d52231826382551fc9d5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-28 14:33:54 +02:00
Kai Koehne
42bf1dba3a Bump version
Change-Id: I7b48adcc38b647a7823899f45b15686832bd4e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-08-28 13:28:43 +02:00
Thomas Hartmann
732d5ec701 QmlDesigner.QmlPuppet: fix for clipping in sub items
We did not clip sub items if clipping was enabled.

Task-number: QTCREATORBUG-9604
Change-Id: I75fdabd86193fbfbf397bf3d119a1a33c72cf771
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:22:11 +02:00
Thomas Hartmann
61e7641a6d QmlDesigner.QmlPuppet: fix for nonInstanceChildIsDirty()
We did not take care of the case where only the transform of a child
changes but nothing else.

Task-number: QTCREATORBUG-9796
Change-Id: Id997e527193c103abf3aeb77826501fb8f701fb7
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-08-28 12:19:22 +02:00