Commit Graph

35759 Commits

Author SHA1 Message Date
Robert Loehning
ff1b87f0d1 Fix string
Change-Id: I283014398b44c1583635cddcd6c55a673ef9a107
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-14 15:23:38 +02:00
Orgad Shaneh
739795ce8c TextEditor: Optimize TextEditorOverlay::createSelectionPath
Change-Id: I9a0eca133a5a56fabab1ab51b91ca9db594a4f27
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-05-14 15:03:18 +02:00
Christian Kandeler
40fb9492a8 ProjectExplorer: Fix qbs build.
Change-Id: I3aab67ac002143fb332f2d1a2d15ae951c0ab2f3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-05-14 14:44:59 +02:00
Marco Bubke
dd6fb08bab QmlDesigner: Share contextHelpId
Moved the code to AbstractView::contextHelpId so it can be shared.

Change-Id: I0a95b5ee079cbc26c87d53587f7766f1c333a245
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 14:34:55 +02:00
Marco Bubke
5794ad016d QmlDesigner: Make DesignDocument::view const
Change-Id: I0d1b8fb55fbd08d556b0daa2d4a7d12bc81c4c13
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 14:34:50 +02:00
Marco Bubke
a6f6f4fdb7 QmlDesigner: Make getters const in ViewManager
Change-Id: I30dd4775b9e23d540a451ef7086cc623473be03b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 14:34:43 +02:00
Tobias Hunger
6aeb1f99b2 VcsBase: Do not crash when no project is selected
Task-number: QTCREATORBUG-12242
Change-Id: I96e4ea8a547d3a3a30883efbe41cd63ff624b4c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-14 14:05:17 +02:00
Christian Kandeler
b7123ba20a Debugger: Fix qbs build.
Change-Id: Ia0a28ffac04857be24fa47becdf1d551b4385846
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-14 12:17:32 +02:00
Marco Bubke
b10e82d33d QmlDesigner: Don't reparent on component complete in form editor
It is changing the order of the items which is not intended.

Change-Id: I2af547a1cc5d23e35ec1aa8d1b13c049a5484276
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 11:36:39 +02:00
Marco Bubke
75fa87eebb QmlDesigner: Fix drag and drop
Task-number: QTCREATORBUG-12227
Change-Id: I02c3bd81ab2b6585d35bab60550788f461e77732
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 11:36:32 +02:00
Marco Bubke
5eb28a5f82 QmlDesigner: Remove custom drag and drop code
Change-Id: I97d94003aef76d014486ff29d0e8f78689f7558f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 11:36:21 +02:00
Fawzi Mohamed
e013c7e651 designer/qmltextgenerator: get rid of deprecated QVariant::Type
removes warning due to QMetaType::Float->QVariant::Type conversion.

Task-number: QTCREATORBUG-12237
Change-Id: I428d4f285005da3befe55626c1f04a3beaa8ac33
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-14 10:32:04 +02:00
Thomas Hartmann
bce112e645 QmlDesigner.PropertyEditor: Using envirmoment variable to debug qml
If someone is customizing parts of the property editor then it is
useful to see any warnings from their QML components.
Debugging QML components should not require to rebuild Qt Creator.

The debug enum was not used anywhere else.

Change-Id: I623234312238906d4c4c90e87a5f2bc488f6fc57
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-14 09:36:21 +02:00
Christian Stenger
7c76854b75 ProjectExplorer: Fix Qt4 compile
Error introduced with 5969c01fa6.

Change-Id: If7ef7959f9d55ffdab9b5f60fbc1fb1ddf75a119
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-05-14 08:59:44 +02:00
hjk
97ab3f58c3 Debugger: Remove non-Python GDB macros to display QString{,List}
Unused, and long forgotten.

Change-Id: I726ccca39348e800e3f7ee89d352afea2007e949
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-13 15:52:26 +02:00
Daniel Teske
5969c01fa6 ProjectExtensionsPage: Rework project combo box
Show a actual tree in the combobox.

Task-number: QTCREATORBUG-12002
Change-Id: I22b62f444923193972109a096bc6eef26a31bf9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-13 15:35:36 +02:00
Marco Bubke
4743217eac QmlDesigner: Exchange QLatin1String with QStringLiteral
Change-Id: Iaefe0ea33ee17795cb402da33e4e7f0da747d4d5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-13 15:05:38 +02:00
Marco Bubke
c7b1ae1ee4 QmlDesigner: Exchange QWeakPointer with QPointer
Because we compile only with Qt 5.

Change-Id: I2c6496f37550438f7c8ccbf8af0090c525b87d8f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-13 15:00:22 +02:00
hjk
811f74ce63 Windows compile fix
Change-Id: I2321ae9310476f36a1b1fa36509ec92f639ee8a7
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-05-13 14:57:22 +02:00
Christian Stenger
2a75c9c572 Squish: Add another test for refactoring C++
Change-Id: I3c0e1f6c501a83595e86afaa39e8c543e0b7189c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-05-13 14:39:50 +02:00
Tobias Hunger
4a478391bb QmlDesigner: Fix warning about wrong initialization order
Change-Id: I6d85dc89a4e0dc978308648feaa4fe754d1d5c14
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-13 14:38:01 +02:00
Tobias Hunger
0c00892dd2 Remove dead code.
Change-Id: I5295dd0f9c828522e5a4a5b1182179ccf64d3d14
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-13 14:37:54 +02:00
hjk
5ac261bff2 Valgrind: Use generic timed future for uncertain progress
Change-Id: Idb7f1b1e5a0fcd0351d6c30f5a6dadcbec191898
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 14:05:58 +02:00
hjk
9e457eefc8 Valgrind: Make tests not crash
Change-Id: I038fc59e87a5e05d325899d02eb67366dc65ce67
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-13 14:05:51 +02:00
Sergey Belyashov
2281d7e618 Fixed Russian translation of Welcome screen
Task-number: QTCREATORBUG-12108
Change-Id: I3db4b5ad44666808cf49ea6e0ce226b9972b1beb
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-13 13:47:16 +02:00
Eike Ziller
2abade735f Fix 'current project' search.
Broke when moving projectFilePath to return FileName.

Change-Id: Ibbf234b68212285b85c8db80c026869310649063
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-13 13:33:57 +02:00
hjk
6107fdc276 Debugger: Add "composite" watchers
Multiple expressions can be separated by semicolon,
and arrays allow index ranges given as [a..b] or
with strides [a.(s).b].

Change-Id: I0b7b4ee500a5f6f5027d777b0a1e8ee5a28a7cd5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-13 12:58:35 +02:00
Fawzi Mohamed
fb1db53054 ios: warn if provisioning profile does not cover the targeted device
Task-number: QTCREATORBUG-12175
Change-Id: I58108bfca92add161ae3c1999954d073b30dba9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-05-13 12:48:46 +02:00
Vicken Simonian
abe4bff86a Editor: Utilize Current Line Number background color
Task-number: QTCREATORBUG-12170
Change-Id: Ib27962a6f72b903fa2caadc441cd6ef51b5b1810
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-05-13 12:28:13 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 11:48:30 +02:00
Fawzi Mohamed
3ee6f37e4b support the latest g++ on mac
the latest g++ on mac is really clang with a compatibility frontend,
and claims to be clang and support all the features clang does
with -std=c++0x (which qmake by default passes in).
But if you link libstdc++ (again the default) then the library has
several gaps. Catch that.

Change-Id: I8387f8fdcfc7639538e576a2e93b2301e07086cd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-05-13 11:23:30 +02:00
Fawzi Mohamed
a544ab672e projectexplorer/qmake-makestep: parse output of xcodebuild
Xcodebuild (used by default for ios and optionally on mac) redirects all
compile errors to stdout.
This breaks the detection of errors.
Redirect stdout to stderr if within xcodebuild.

Change-Id: I60fd21a7b075fbfc29c99a10debf34e20487c4df
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-13 11:23:11 +02:00
Christian Kandeler
226c1abc89 Fix compilation of external tool test with qbs.
Some files were missing, which did not manifest itself with qbs 1.2
due to files being accidentally picked up from other locations.

Change-Id: I9ed91246483f4f53bc21a79a9e2029fedb8a702d
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-05-13 10:30:06 +02:00
Leena Miettinen
8ddf682885 Doc: update changed Valgrind menu item names
Update screen shot.

Change-Id: I255f4b8c620ad89239a20c0c211ed60961db1ade
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-05-13 09:38:20 +02:00
Eike Ziller
1228ffcd6c Help: Implement history menus for text browser backend
Change-Id: Idbdb3f9807c8282f8c9050ba28c1e28a7e3865e7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 09:00:18 +02:00
Eike Ziller
96e8f0bb7b Help: Cleanly separate different viewer backends
Removes the conditional compilation of the text browser vs web kit,
cleans up the code, and enables us to provide and test other backends
(WebEngine? Native?)
Adds runtime switch for testing the text browser variant by setting
environment variable QTC_FORCE_TEXTBROWSER (for now)

Change-Id: I8cc9bb373438d37c8194e433224314caa0b617bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 08:57:47 +02:00
Orgad Shaneh
0ae6905525 CppEditor: Avoid repetitive function calls
Change-Id: I1f3e316336376887ec2e546fcb0cb714c777ee0b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-05-13 04:20:27 +02:00
Orgad Shaneh
519913e599 CppTools: Pass const QString by reference
Change-Id: I3ad42095b7029cb58223a7bb7f9ce21dda29f50f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-05-13 04:20:10 +02:00
Orgad Shaneh
038f59836b CppTools: Minor cleanup
Replace repetitive condition with switch-case statement.

Change-Id: Ib022d6970257d054f47229b70c1c0db4b6f2e80c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-05-13 04:18:17 +02:00
Thomas Hartmann
cdcaca4269 QmlDesigner: Add QmlDesignerWarning
This adds a general asynchronous warning to the QmlDesigner.

Change-Id: Idf7989c52108f454191650fbb971261e1119ca09
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 22:13:45 +02:00
Marco Bubke
539da9fe5c QmlDesigner: Kill a process if terminate is not working
Task-number: QTCREATORBUG-12000
Change-Id: I44ccbabefa94fd0136941d3adae37e744df139d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-12 20:57:00 +02:00
Marco Bubke
066a45e18c QmlDesigner: Fix empty text drawing
Task-number: QTCREATORBUG-12119
Change-Id: I1ff6896e6ff2f5b412e6e78e5d9129bf325ff9b1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-05-12 17:38:39 +02:00
El Mehdi Fekari
16d3881b5b Qnx: Detect Qt version for BB10 with the new mkspec changes
Task-number: QTCREATORBUG-12222
Change-Id: I28cfc2a3d35f55576bd52ecb720d74c6d432786e
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
Reviewed-by: Wolfgang Bremer <wbremer@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-12 16:37:40 +02:00
Christian Stenger
9b356e2c77 ProjectExplorer: Fix build for Mac (Xcode < 5.1)
Change-Id: I1ea1edbb0a5e15888cabadddbbb460d7c6f0b09b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-12 16:15:33 +02:00
Thomas Hartmann
6aeb2fabc2 QmlDesigner.PropertyEditor: Avoid side effects of ColorButton
The ColorButton did change the color as a side effects of rounding error.
With this patch the ColorButton does onyly change the color as a result
of user interaction.

Task-number: QTCREATORBUG-12202
Change-Id: I6504713a27fe7b562b8342229bd287af23156602
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:31 +02:00
Thomas Hartmann
aff4424f38 QmlDesigner.PropertyEditor: Use ToolTipArea in ButtonRowButton
Change-Id: I462f45dd962f1f136e2cf010b0092457345ec485
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 15:47:22 +02:00
Tobias Hunger
0d758c5252 Settingsaccessor: Add missing include
I hope this will fix the build on the Mac buildbot.

Change-Id: I47169f7baee96b64980d42dea9b540b4fe9e1cbc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-12 15:24:03 +02:00
Thomas Hartmann
af30fdc916 QmlDesigner.PropertyEditor: Fixing Preferred highlight properties
Task-number: QTCREATORBUG-12216
Change-Id: Ia0452f96c41e7759c6594ecff0fb9e104dae396e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-05-12 15:10:20 +02:00
Thomas Hartmann
d9727c2816 QmlDesigner.PropertyEditor: Enabling tooltips for labels
The old property editor did support tooltips and many labels
have properly defiend tooltips.
In QtQuick.Controls we have to use private API for tooltips
to show up.

Change-Id: If1c50b58e8388b8846c2dd07fcd326f09d67d127
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2014-05-12 14:57:15 +02:00
Daniel Teske
3c413fc358 Rewrite ::getObjects usage to use predicate version
This makes the code easier to read and shorter.

Change-Id: I6d582bd9861aa0208565301f61f098e9313b6c89
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-12 14:54:46 +02:00