Commit Graph

32962 Commits

Author SHA1 Message Date
hjk
de70de2246 BareMetal: Remove unused data member
Change-Id: I0d5953e039035b22e4a0ec839f5e0cd016b22604
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 14:32:31 +02:00
Nikita Baryshnikov
2001a7c702 CMake MakeStep update connections
Also connection to setUseNinja was replaced by signal emitted inside it

Change-Id: I8185568d88cd1c5f0603931e3104136e59f1da7c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-19 14:29:41 +02:00
hjk
b26a17f30d CppTools: Change CppModelManager implementation pattern
Replace the CppModelManagerInterface/derived CppModelManager
combo by a more common CppModelManager/CppModelManagerPrivate
pimpl pattern.

Change-Id: Ia4582845ed94d5ef60b8571bab9b2260c6290287
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-19 13:17:55 +02:00
hjk
e5e8693148 Debugger: Merge two remote setup communication paths
Success and failure paths are very similar.

Change-Id: Iebf218f64401884c014f1f7745d504183018addd
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-19 13:00:59 +02:00
Nikolai Kosjar
ea6514b235 C++: Show virtual functions menu only if resolving was requested
That is, if the user does Ctrl+LeftClick or (Ctrl+E,) F2, but not on
hover.

The described bug in the report occurred because we immediately jump to
an item if there is only one, e.g. in case of no overrides. That could
also happen on hover, which lead to the undesired effect.

Change-Id: I79f6fa1f90d37ea209da022d55d48aab2c13c21a
Task-number: QTCREATORBUG-12986
Reviewed-by: David Schulz <david.schulz@digia.com>
2014-09-19 12:24:54 +02:00
Orgad Shaneh
9d3ed02854 CppTools: Fix compilation with recent gcc 4.9.2
See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224

.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()':
cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()':
cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()':
cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'

Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit c023a1cac1)
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-19 11:38:58 +02:00
hjk
9a968b7417 CppTools: Move DependencyTable to Snapshot
It logically depends on the Snapshot and has a related lifetime.
Keeping it in the Snapshot avoids some code compelxity.

Change-Id: I24ee4483b44d9b0d7f2e4d494ae7ea624b949f9c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-19 11:11:30 +02:00
Nikolai Kosjar
0273757c93 GenericProjectManager: Fix plugin tests
The signal was emitted before the spy connected to it.

Change-Id: I5b70c32b8346192d6d58304f05961213ec4d5a57
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-19 08:30:22 +02:00
hjk
aba863cb18 Android: Add comment about the protocol used in the runner
This is mostly a copy of the commit message of 06d4c0b2e but its
more convenient to have it in the code than to browse git history.

Change-Id: I97a7a3c10f07fc268ba67986f1e830ee92d9c28d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-18 18:42:53 +02:00
Daniel Teske
347cb21ae2 DesktopQmakeRunConfiguration: Optimize response to proFile parsing
Only emit the environment changed signal after everything has parsed.

Change-Id: Iba26c8ba2fc7de9e03ec1368917985538ffbbfb9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 17:10:06 +02:00
Daniel Teske
2cc17a61eb QmakeGlobals::expandEnvVars: Make sane
Use indexOf() to match individual characters, which is a lot faster than
QRegExp. As a side effect, don't try to expand what we just inserted.

Change-Id: I964fbd92055f2f2649e7d8ed5739cf1fc7cae927
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-18 16:48:16 +02:00
Tobias Hunger
a5828911be JsExpander: Do not crash on exit
Change-Id: I55caca6dd5b316b2573b443175448d732101871c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 16:12:23 +02:00
James McDonnell
2b89e759cf QNX: OS/X support
On OS/X, use the darwin subdirectories in the environment.  Makes it
easier for those of us with access to the OS/X based QNX tools to use
Qt Creator on OS/X.

Change-Id: Iebc3a89978e6211781404bfc8a4ba95a3523d8b5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 15:34:10 +02:00
Tobias Hunger
3088c97254 Core: Have the JsExpander take ownership of registered QObjects
Change-Id: Ice5f232d5d7bed32b23f6713b7fa44f44a3ea502
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-18 14:56:23 +02:00
Tobias Hunger
57cc272770 CppTools: Add some methods to the JsExpander.
Make some C++ related methods available to the JsExpander. These
are concerned with namespace handling, etc.

Change-Id: I2fc3807cf421b817bb103b727606a78aee290652
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-18 14:38:30 +02:00
Tobias Hunger
f5d48bf39e Core: Add a basic extension for the JsExpander
This adds a "Utils" object to the Js runtime offered by the
JsExpander that adds some useful functions.

Mostly file name mangling and finding preferred extension
from the MIME type database.

Change-Id: I907dae7f295167667ac2ae81461bbff16dc98ef4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-18 14:38:08 +02:00
hjk
e014847cdd Debugger: Compile fix.
Change-Id: I7fc0c4deda436ca0389bef2fc510b6e74d976078
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-18 14:36:10 +02:00
hjk
01079bb4d9 TextEditor: Setting flags once is enough...
Change-Id: I671d1b0866f2e6ef332a53228bc12b260ba6187d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-18 13:41:18 +02:00
hjk
43a2c5ddf8 TextEditor: Make sure "global" connections are properly destroyed
Task-number: QTCREATORBUG-13054
Change-Id: I32234836dc893075978dbc5fe43d696bc0f228f4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-18 13:40:58 +02:00
Orgad Shaneh
f0e2708d3e Debugger: Support setting substitute path by regexp
This is useful when there are multiple build machines with different
path, and the user would like to match anything up to some known
directory to his local project (variable support will also be useful -
will try to add that later).

Syntax: (/home/.*)/KnownSubdir -> /home/my/project

Capture group will be replaced by the value.

In this example the substitute path will be (in case a source string
found such as /home/SomeUser/SomeProject/KnownSubdir/foo.cpp):
/home/SomeUser/SomeProject -> /home/my/project

Change-Id: I19d03c9388161d8456a86676086dcb06dc3d7370
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-18 13:37:04 +02:00
Orgad Shaneh
63da3cb9e0 Debugger: Do not use native path separators for source directory
In target debugging or core dump, the source is typically linux,
so converting the separators doesn't make much sense.

Paths are converted internally by CdbEngine, so no change is needed there.

This is required for regular expressions support.

Change-Id: I19488798856b731ef77a14383d12b110eae5d369
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-18 13:36:55 +02:00
Orgad Shaneh
889a040366 ManhattanStyle: Use QRectF instead of QRect for adjustment
Broken in 6f7a6282e59a82e4c7609c0090da05f5da1dda91

Change-Id: I752295af28494efe3eb59ef31b111a0079d47ff7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-18 13:21:39 +02:00
Christian Kandeler
74939b1884 QtSupport: Fix qbs build.
Change-Id: I4109c870f9b7e14f31796899f833b309e0e9525e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-17 17:09:46 +02:00
Fawzi Mohamed
faa8c08adb ios: simulator integration support for Xcode6
Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
2014-09-17 15:30:38 +02:00
Leena Miettinen
7e8245eae5 Doc: fix tooltips for Qt Quick Controls
Remove initial definite article and add punctuation.

Change-Id: Ic64af9bfe2b565a625d46b163bffecface897eda
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-17 12:27:37 +02:00
hjk
7e7879d2a7 AndroidRunner: Initialize qmlPort member even if unused.
Change-Id: I7c4d07635faf0fc2512fd9e1145d606340e045a8
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-17 12:10:42 +02:00
Orgad Shaneh
7cac047ff6 Utils: Draw focus frame for Details button
Change-Id: I2dfacd2a6687a11194f5874da315010f7d3f3eff
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-17 11:55:06 +02:00
hjk
7104998d41 CPlusPlus: Simplify MatchingText interface
Change-Id: I46878d9ca048d0c79032445f5adc27c12d27f30c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-17 11:26:14 +02:00
hjk
3be2c9dfb8 CppEditor: Simplify CppAutoCompleter header
Change-Id: Ie6c01ca4fb11b4b4c5e66618c9f8f0cb67e7845b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-17 10:59:08 +02:00
hjk
282864bdb9 CodeAssist: Remove needless indirection in item access
Change-Id: Ibcb6c4898b34ecab52de28485befdf589bb880d7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-17 10:56:16 +02:00
Orgad Shaneh
866a99b655 ManhattanStyle: Simplify focus frame drawing
Change-Id: I61ca02b7cbdc124f756f9ca86b2ea297fd03f623
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-17 10:21:24 +02:00
Christian Stenger
19d20f4b70 Core: Fix compile for gcc 4.7.3
Change-Id: I941179964158eb869299f068f8cd92a45f230967
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-17 09:46:48 +02:00
Orgad Shaneh
b126179611 QmlDesigner: Fix compiler warnings
navigatorview.cpp:297: warning: unused parameter 'oldIndex'

navigatortreemodel.cpp:344: warning: 'void QmlDesigner::findTargetItem(.
..)' defined but not used

Change-Id: I02183215f766a31fea63da15c7d79c1dd563d840
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-17 08:59:30 +02:00
Thiago Macieira
8907c0936f Add missing #include for QObject
Change-Id: I8bb1de0f042f95e8269431c546f4180b5cce5867
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-17 08:48:07 +02:00
Ulf Hermann
8584730963 QmlDebug: Avoid hiding of virtual functions
Change-Id: I1722f5298693b6ed9700dcd65d5e2210500a6206
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 18:09:08 +02:00
Tobias Hunger
1eaadfa7d7 FancyLineEdit: Take validator into account
Take validator into account (if set) when checking validity
of the input.

Change-Id: Ieec7249aff50cf419833693dcf33fb241e4c044a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-16 18:08:55 +02:00
Erik Verbruggen
990cedeb1b C++: remove C/C++ distinction from ProjectPart fields.
.. because they now hold only files for a single language+extensions
combination.

Task-number: QTCREATORBUG-11709
Task-number: QTCREATORBUG-12818
Change-Id: If294f6de07d60126be733d98de12b89b8af3efce
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-16 17:01:35 +02:00
Tobias Hunger
193cb3b9a5 Qt: Add features for Qt4 and Qt5
Change-Id: I3456c1b62f81c8137fb307b40903ce7b989ad21a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-16 16:55:45 +02:00
Tobias Hunger
cb0a3f5dcc Utils: Remove unused IpAddressLineEdit class
Change-Id: I919e7ab79dc779b9586b74d31271d8ddce817061
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:51:45 +02:00
BogDan Vatra
8bb83b514f Force uninstall of any Qt apps that are using Qt < 5.4
On Qt 5.4 the problem was fixed by
https://codereview.qt-project.org/#/c/91261/

Change-Id: Id139fe2fe1e83ac5108ffeeb140cb8d2f16747c7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-16 16:33:51 +02:00
Orgad Shaneh
41942ac088 VCS: Fix displaced comment
Change-Id: I71f0169951b5dfd9cedeff82006b757dd4df756e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-16 16:16:56 +02:00
Tobias Hunger
df50e214f3 QtSupport: Add codegeneration.h/cpp
Change-Id: Iec1d4b303e6154b5d2d32e4d3ab7c02893bcc5f1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-16 16:13:49 +02:00
Orgad Shaneh
850276d9f9 VCS: Make text wrapping independent of actual editor
Narrowing the submit editor down corrupts the commit message

Also fixes the following cases:
# comment that is wrapped
to next line <-- this line currently appears

comment in the middle of
# wrapped line <-- this line currently disappears

Change-Id: I7a35058569f002479c646ef6cfd1fdb1ada401c9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:45 +02:00
Orgad Shaneh
6158a4ca58 VCS: Avoid repetitive calls to cleanupDescription in submit editor
It is called twice on each change to the text, and called again on
commit.

Change-Id: I8bfa2b37247a270f8b92e0b8a4e581278acf4cea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:14 +02:00
Orgad Shaneh
2a8fa5579a VCS: Fix line wrapping for lines that end with a dash
Task-number: QTCREATORBUG-8528
Change-Id: I894e562c3c6568233a85689dc1a759644779adb5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 16:12:10 +02:00
Erik Verbruggen
cc6a9babe0 C++: Move preprocessor settings handling to the document.
This cleans up the handling of those settings, and makes sure that the
C++ document is setting those settings before parsing. This also
prevents lock contention in the parser, because before this patch the
document would kick of the initial parse (after opening a document),
after which the editor would come in and try to set the preprocessor
settings, resulting in the UI thread locking until the initial parse was
done.

Change-Id: Ia2e18a9667e10279f045c1c5849046ec4cfe85ae
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-16 15:38:20 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
hjk
11f89ece8d Android: Separate debug and analyze support
The common base class contains only unused functionality.

Change-Id: I5f6db59a2972d6ab8383ce209937090cd46ae39d
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-16 13:37:15 +02:00
hjk
3fb7c81a92 Debugger: Better remote engine setup result reporting
Use one less signal for result passing.

Change-Id: I6209d248fb01056835ef65b91981b9b2747d6f7f
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-09-16 13:19:23 +02:00
Tobias Hunger
db6af3f152 VariableManager: Add support for javascript varibales
Add JsExpander that can be used to register additional functionality
in its qscriptengine and to evaluate expressions.

Register that with the VariableManager, using the "JS" prefix.

Change-Id: I7d8f1ddc3484104f3943685dbac09e786d60212e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-16 13:18:14 +02:00