Commit Graph

32962 Commits

Author SHA1 Message Date
Ulf Hermann
38f4d6a5f2 QmlProfiler: rename "eventId" fields to "typeId" and "selectionId"
The convention is now that selections are the rows in the expanded
timeline, "types" are the types in the QmlProfilerDataModel, and
events are the single boxes in the timeline. Thus, the event view
shows only types and for consistency the V8 view does so, too.

Having eventId as synonym for "type index" and "event index" as
actual index into the list of events is confusing.

Change-Id: I6b7c4c3f1ab0a8b71c511de52ab296a2e91cf5f0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 13:06:45 +02:00
Andre Hartmann
6bf9a19276 Generic Project: Fix adding wrong include directories
Task-number: QTCREATORBUG-12727
Task-number: QTCREATORBUG-12873
Change-Id: I1dffad5af9ac254fa17f89291db7baf640ed1851
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-29 12:05:54 +02:00
Daniel Teske
f39a86f70e LdParser: Use QRegularExpression
Change-Id: I0c183894389d92178a469fe2980568b7517a153c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-29 11:20:37 +02:00
Eike Ziller
0aecf9c195 Merge remote-tracking branch 'origin/3.1' into 3.2
Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c
2014-09-29 10:31:12 +02:00
David Schulz
7059353520 Perforce: Disable actions when outside a repository.
Task-number: QTCREATORBUG-13092
Change-Id: I3d059af748f0160ebfc97bebbd43de9210f17250
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-29 09:50:27 +02:00
Orgad Shaneh
b1aa9bf223 TextEditor: Adapt include guards to file rename
Change-Id: I1bb8cb6baec091fd924b3738f93a83196c22d807
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-29 09:26:03 +02:00
Erik Verbruggen
fdf6f83a99 QML Debugger: prevent possible nullptr deref.
Change-Id: I9a3766665bae737a15aac18900185edb2c0ad87b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-29 09:00:49 +02:00
jkobus
5c6b1373c4 DiffEditor: Use settings' foreground color for highlights
Simplify drawing highlights by passing selections
into a drawing function.
Reduce selections which are covered completely by
other selections.

Task-number: QTCREATORBUG-12844
Change-Id: If282d5c881d25cac1b8db4ac8dfc45d47b0b8580
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-29 08:21:34 +02:00
hjk
cb4f04f416 Debugger: Remove unused fix cdb integer functions
Change-Id: I60e379fdc36f67fdd8fc2d0d440ed41a82374f97
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-29 07:19:58 +02:00
Orgad Shaneh
1154aab0b7 Debugger: Fix crash on regexp matching
Conversion of QList to QVector required further adaptations.

Instead of trying to match all expressions, break on first match.

Change-Id: I76d67ae876687ac15f3099a0a26eac582ad73c76
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 22:53:50 +02:00
Orgad Shaneh
c218c051c6 Debugger: Support variables for target
Useful for e.g. substituting any build dir to current project dir.

Change-Id: I50e8c101fa39bd45e55eef65776b18ef76bfd6ad
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 20:58:46 +02:00
hjk
e11bbac671 TextEditor: Add a convenience append method for quick fixes
Less noise on the user side.

Change-Id: Ia5b495a1f9d3ec43623056d793f6771b3b84fd6b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-26 18:55:50 +02:00
Tim Jenssen
14022854d4 QmlDesigner: Use QQuickWidget again
This is the revert of the reverts ;)

Change-Id: I750dfffa6d509e058b97b605be5f2cc0a42c28f3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-26 16:48:38 +02:00
Daniel Teske
d1dd7fe369 AppOutputPane: Fix possible use after free
Task-number: QTCREATORBUG-13022
Change-Id: Iaf763541c3876778576be09f50a2977d0d6d1b41
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-26 16:34:33 +02:00
Eike Ziller
a56432b3b1 Share code between "central" and other help viewers.
This removes a lot of duplication of actions and interaction.
It's also a preparation step into making the external help
window behave more like the full-fledged help mode.

Change-Id: I318d831f229b0a75bb8702a5f163c96cce6a668c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 14:49:09 +02:00
Robert Loehning
9d3ae49e30 Session: Fix compilation
This was broken in fe8ed7f5a6

Change-Id: Iff4dffa6ba6cfdeeb3664c026ce642b80e4deeeb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-26 14:48:57 +02:00
Eike Ziller
85ac965116 External Help: Add home and bookmark buttons
Change-Id: Ia2442dfa435e964820ec6a721071fce4d4a04061
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 14:47:23 +02:00
Eike Ziller
3f546f7bef External Help: Make back/forward keyboard shortcuts work
Change-Id: I3e03877df8183f0c0cab4fae35ab41ce92125ccd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 14:46:44 +02:00
Eike Ziller
444fc88dbc Help: Remove unused "external" tool bar
Change-Id: Ib6c75c718c1217d8f7e645462e3acf161630bbab
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 14:45:02 +02:00
Daniel Teske
fe8ed7f5a6 Session: Fix saving session data on shutdown from project mode
This was broken in d52ee686d1.

Task-number: QTCREATORBUG-13098
Change-Id: Ia075e13fdd00e561b78058a3cab0cb02d2eb5fe6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 13:35:57 +02:00
Eike Ziller
0f39b4e9e7 Reuse code for open documents and open help pages panes
Change-Id: I4924e72e732eb447d2e581d60f5e4426f5ff7cb2
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-26 13:34:00 +02:00
Daniel Teske
e1a084ccf8 CmakeLocatorFilter: Make it threadsafe
Task-number: QTCREATORBUG-13070
Change-Id: I196170ebf1ee8bfee037a3c802c8d0169be2a501
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 12:56:55 +02:00
Daniel Teske
b633838d00 Android: Fix debugging with DESTDIR
Task-number: QTCREATORBUG-12913
Change-Id: I29b5b86c47b7b618b96c0b32a6143b7830ed9cd3
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-26 11:56:36 +02:00
jkobus
8a3a219b49 Remove unneeded code.
Looks like this is not needed anymore, since
now BaseTextEditor has its own automatic
font settings application mechanism implemented.

Change-Id: I61c8dafdb76e9e5d04207d0762d4ede4707531e9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 11:18:10 +02:00
hjk
953cdb971f TextEditor: More BaseText* -> Text* renamings
*Document* and *Layout* classes, all basetext* files

Change-Id: I1c6e376733a434fcb5c7f19c6210dfa031eeafde
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-26 10:12:51 +02:00
hjk
4edc6896ad ProjectExplorer: Fix connection after slot move
Change-Id: I82b62dda6254ff5e2ff02911f7be5717aaebb1f8
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 09:54:52 +02:00
hjk
2b71533f95 ProjectExplorer: Fix connection after slot move
Change-Id: I0e3af10f74c50ea66e87396259d88a360979f7b7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-26 09:46:01 +02:00
hjk
1ba91e3040 ProjectExplorer: Apply static pattern to ProjectExplorerPlugin
Adjust caller sites and surroundings.

Change-Id: I6c3c80e42f35eabedc1f89c8c42cca1025aca12f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-26 08:50:00 +02:00
hjk
d066e3ca14 Remove some unneeded TextEditor:: qualifications
Change-Id: I9bf7df2f30001440af013b0dd4040a845df80300
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-26 08:49:48 +02:00
hjk
111f65b518 Core: Reorganize ReadOnlyFilesDialog
Move exported class out of namespace Internal, but expose only a minimal
interface. Use Qt 5 connections, adjust callers and surrounding code.

Change-Id: I52b4156d78cd1ec42ec6c94994775ce74f24ebdc
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-25 18:06:47 +02:00
hjk
0fcca946ad Rename {Core,TextEditor},{Base,}TextDocument classes
First step of some more 'Base' removal in TextEditor.
s/Core::TextDocument/Core::BaseTextDocument/
s/TextEditor::BaseTextDocument/TextEditor::TextDocument/

Change-Id: I71ba325a2f0ad72ec9dae0d96846cbae72d326f7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-25 18:00:51 +02:00
Eike Ziller
33670d22f7 Fix build after QTC_OVERRIDE removal.
Change-Id: I7ffda701c7f0882860017a415949902d78e3466d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-25 17:50:10 +02:00
Daniel Teske
7a99593f58 Task: Use a static cache for the error and warning icons
Saves around 33% of testGccOutputParsers runtime.

Change-Id: I5c6d0f8af8a36c153e84907e77643f4e20c8f6a1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:34:18 +02:00
Daniel Teske
9a6fe9509d GccParser: Use QRegularExpression
Change-Id: If36b46c91da302e1885d49d0d94d2aead217682e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:33:51 +02:00
Daniel Teske
25f8d47780 MsvcParser: Use QRegularExpression
Change-Id: I919218cd5c3047dfbafda9f3adbb4ad6fd8c1de3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:32:37 +02:00
Daniel Teske
98d89aa54b KitManagerConfigWidget: Use QRegularExpression
Change-Id: I71c594d89090b6d74d790ae6395ea15025775ff7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:29:52 +02:00
Daniel Teske
637d53c649 GnuMakeParser: Use QRegularExpression
Change-Id: I54813888af9203214b3d48732dab71bbc279c220
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:29:45 +02:00
Daniel Teske
cb6c9d2b73 ClangParser: Use QRegularExpression
Change-Id: I08e9ee73fef0cffd7c31508838b104d0894fbfdb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 15:29:39 +02:00
Tobias Hunger
30955a9058 Git: Remove gitorious code
Gitorious has changed their APIs a while ago and nobody seems to have
noticed. The only bug report I got was from Christian who tests Creator
regularly. So the code seems to be unused, which I find not surprising
considering the limited popularity of gitorious nowadays.

Task-number: QTCREATORBUG-12858
Change-Id: Id92747fd146434ad737315320fa08afd96223a7e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-25 15:19:51 +02:00
BogDan Vatra
3bcae52584 Android: Say hello to gradle!
Switching from Ant to Gradle brings lots of advantages:
 - it is way faster when rebuilding (25-50% faster than ant).
 - it enables first class Android Studio integration.
 - adding Android Extras libs (e.g. Google Play services, OBB, etc.) to
   your project is now painless.

[ChangeLog][Android] Added Gradle support to build the APK.

Change-Id: Iee492954f8ffb2c22e6ab14a8a25faf644de9a51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-25 13:15:25 +02:00
Christian Kandeler
222fbdb58b QbsProjectManager: Get rid of some redirections when accessing members.
Change-Id: I3f2c7717179bf1654c6bdafd2088f5384287f90e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-25 13:12:15 +02:00
Christian Kandeler
38320b15f5 QbsProjectManager: Take product profiles into account.
- Identify products by the name/profile tuple instead of just the name.
- If the product's profile differs from that of the overall
project, add it to the visual representation.

Change-Id: I4a89db60911277977458370157e435472bbe428f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-25 13:11:33 +02:00
Thomas Hartmann
48f19e925b Use Q_DECL_OVERRIDE instead of QTC_OVERRIDE
This patch removes src/libs/utils/qtcoverride.h
and uses Q_DECL_OVERRIDE from Qt 5 instead.

Change-Id: I61ffa539648ffe996dc061eec7708c04580c0f09
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-25 12:16:47 +02:00
Daniel Teske
652c53bf06 EnvironmentWidget: Tweak keyboard navigation
Make Enter/Return start editing the widget and also make Tab/Shift+Tab
order while editing saner.

Task-number: QTCREATORBUG-13013
Change-Id: Ie514438f15c5a15920ca3e2bb7ac83548cd0b9c4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-25 11:45:24 +02:00
Nikolai Kosjar
4da91bef8d C++: Fix endless loop in lookup on Windows
...for templates with typedefs referencing the respectively other
template (basic_ostream <-> ostreambuf_iterator).

Tested with MSVC 2013.

Regression introduced by ba42ceb0cb.

Task-number: QTCREATORBUG-13064
Task-number: QTCREATORBUG-13065
Change-Id: I71a45c720663a73c3302eb7da731e6ad2d8f0fbd
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-25 11:35:47 +02:00
Tobias Hunger
9a3a3d4711 JsonWizard: Remove scratchfile wizard
Replace it with a json wizard based implementation.

Todo: This removes the keyboard shortcut available to trigger
this wizard. We should make sure all wizards are available
for binding keyboard shortcuts to them instead.

Change-Id: I1aa76222d08371e79c40b52aeb26705f3ccb4899
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 10:55:40 +02:00
Thomas Hartmann
7d1e27a921 QmlJSEditor: cleaning up dependencies to QmlDesigner
QmlJSEditor does not depend on QmlDesigner.
There is no reason that the settings for the Qt Quick ToolBar
are stored in the group of QmlDesigner.

This patch removes  all includes of qmldesignerconstants.h in QmlJSEditor.

Change-Id: Ie692d9179e0239c3307420001547ba658911d39b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-25 10:38:08 +02:00
hjk
99aa9955fd DiffEditor: Fix summary view appearance
After the settings centralization it got visible margins which
are unwanted in this particular case.

Change-Id: I7c394e167035d3292a3a45e98fe711d3959ad353
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-24 21:21:39 +02:00
hjk
209f008662 TextEditor: Draw background first.
Task-number: QTCREATORBUG-13028
Change-Id: I14ae1794c920b3877f9eca468e1180042b51fb3f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-24 21:21:25 +02:00
Tobias Hunger
2b8e81893a JsonWizard: Add FileGenerator
Add a generator that takes template files and turns them into the
real thing.

Change-Id: I565d6aabdcd391adc34886f4741e0dbbad5e13ec
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-24 17:08:58 +02:00