Commit Graph

32962 Commits

Author SHA1 Message Date
Tobias Hunger
6511511291 Bookmarksplugin: Remove unused member
Change-Id: I20d5555f963f877b505ca62dd51fe155692c1348
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-10 13:57:53 +02:00
hjk
0e16affc89 TextEditor: Move some hover handler operation from Editor to Widget
Change-Id: Ie54bf52d3f89c76f379d20c4807b1e252af51505
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-10 13:11:53 +02:00
Nikita Baryshnikov
ebd8fef1be Mercurial fix commit
Correct signal signature is parsedStatus(QList<VcsBase::VcsBaseClient::StatusItem>)

Change-Id: I84f35620e9a702c90a222408a75a471d04ca1d51
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-10 13:11:43 +02:00
Ray Donnelly
c7cb97aaea autotools: Use summaryInWorkdir() for configure step
So that it is more informative, displaying:
configure in $buildDir
instead of:
configure
Though IMHO displaying the relative path to configure
would look better.

Change-Id: If5ec2597d8c4ae064281f848104a8eb99f2c5d1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-10 13:06:34 +02:00
hjk
0db7c46ffb VcsBase: Remove one unneeded #include
Change-Id: Ifd037e2e561cce30758510cf3423cf96cf524191
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-10 12:45:21 +02:00
Daniel Teske
109228fa62 QmlJsCodeModel: Respect QT_NO_CODE_INDEXER environment variable
setting QT_NO_CODE_INDEXER = 1 disables the qmljs code model,
as consequence the qml designer will not work with this setting.

Change-Id: I71a2989b14e55e4d130463edd4a6459dee3cbd3d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-10 12:18:34 +02:00
Christian Kandeler
9090176d38 RemoteLinux: Fix run configuration.
Commit 0c3eeab4 had two brown paper bag issues:
    - The run configuration's fromMap() function still assumed a file
      path instead of a simple string.
    - The BuildTargetInfo's equality operator must of course compare all
      members, as otherwise all kinds of things can break; e.g.
      Target::setApplicationTargets() might erroneously omit to signal
      a change.

Change-Id: Ie55b7edc69f272dedccb903a1cc8ed100fce7460
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-10 12:16:13 +02:00
Eike Ziller
2be7fad9a8 ProjectTree: Support dragging files onto editor splits
Change-Id: I26e4de2818d89c012526116851d67155d3eeaa7e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-10 09:36:35 +02:00
hjk
0edefc4c2b TextEditor: Merge some "assist" related classes
Simplifies the code base by removing one level of unused
and unneeded abstraction.

- Merge {I,Default}AssistInterface to AssistInterface
- Merge {IAssist,Basic}ProposalItem to AssistProposalItem
- Merge {IGenericProposal,BasicProposalItemList}Model to GenericProposalModel

Change-Id: I54ee7b095427383d67a00fc1d87c3808c21d812d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-09 21:01:22 +02:00
Christian Kandeler
0c3eeab464 RemoteLinux: Create run configs by target name, not by project file.
The current approach fails for all build systems where one project file
can define more than one executable.

Change-Id: Ieda413975709fbd6e7ea87b185aa962f63cb7c1f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-09 17:53:14 +02:00
Thomas Hartmann
0bb66932e3 QmlDesigner.TextToModelMerger: Fixing comparison of QVariant
n the case of custom types, their equalness operators are not called.
Instead the values' addresses are compared.
This is not want we want. Instead we have to cast and compare
our custom types manually.
This fixed a couple of QTC_ASSERTS.

Change-Id: I3a82b84744f9b8860b7efaeb203475bb9dba5d11
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-09 16:53:53 +02:00
Tim Jenssen
4ca49dc909 QmlDesigner: add more specifics
Fix: QTCREATORBUG-12798

Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-09 16:21:44 +02:00
Robert Loehning
758e189dca Fix typos
Change-Id: I4d1be4f380c37589dbc5a2bbd0fd3230ebbfee47
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-09 14:59:47 +02:00
Przemyslaw Gorszkowski
c228b36ccf C++: add support for resolving typedefs for template arguments
Example:
template <typename T>
struct Base { T t; };
struct Foo { int foo; };
void fun() {
  typedef Foo TypedefedFoo;
  Base<TypedefedFoo> baseFoo;
  baseFoo.t.// no code completion
}

Change-Id: I4822693d3fa1ee2e9b0e4cdd28bb9a8d441fb313
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-09 13:49:31 +02:00
hjk
bf0e0d80aa Debugger: Don't skip first char after "This GDB was configured as \""
sizeof(needle) includes the \0 terminator, so the first letter of the
target triplet was being skipped too. This caused the architecture to
be mis-detected and (for us on MSYS2) the 32bit GDB to be selected in
64bit Kits.

Change-Id: Id54bc320baf6cc604f2d41fa7ff05aca0756a296
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
2014-09-09 13:32:55 +02:00
hjk
ffc00e5ea0 CppEditor: Denoise cppfunctiondecldeflink.cpp
Namespaces, one overly flexible function template.

Change-Id: I229127f28dbc6460999d80e7c28152205dfca356
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-09 12:49:44 +02:00
Nikolai Kosjar
e9e111ffa8 CppEditor: Fix local renaming
CppLocalRenaming was connected to the initial QPlainTextEdit::document()
and not the "updated" QTextDocument set by
BaseTextEditorWidgetPrivate::setupDocumentSignals().

Broken by

    commit c655d7e598
    CppEditor: Convert to new construction scheme

Change-Id: I2e785a9d62a3bd39d9e613776cfc8e35dd9ff5d4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-09 12:07:18 +02:00
Ulf Hermann
36d8ad4c39 QmlProfiler: drag&drop reordering of models in timeline
Task-number: QTCREATORBUG-12337
Change-Id: I399593f44aa8ff8dd79c623108fecb3c317cb63c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-09 12:02:38 +02:00
Ulf Hermann
00650c8b65 QmlProfiler: connect category labels to specific models
By listening only to the relevant expandedChanged and rowHeightChanged
signals we avoid accessing invalid data on clearing. When clearing the
models each one is collapsed. The collapsing in turn triggers
rebuilding of the labels. Unrelated labels could access already
cleared data like this.

Change-Id: I3fad45f5c6279019fbc27ec54e758f498a9d55f2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-09 12:01:58 +02:00
Orgad Shaneh
dc6c0bceac C++: Remove double return in FindUsages
Change-Id: I76a0f4e20b364affdd8a7939fced6f0f012b661c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-09 11:58:47 +02:00
Orgad Shaneh
860d500efb Fix compilation
Missing include

Change-Id: If85675529f034ba7bfd329da06e7c01d8ae08912
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-09 11:58:27 +02:00
Orgad Shaneh
20b836f59c DiffEditor: Simplify makePatch
Store indices in controller and avoid passing them around.

Change-Id: I49c80cb6cf6734a18f80ad5c7c441973d246708f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-09 08:40:05 +02:00
Erik Verbruggen
b01a6a4663 C++: IndexItem cleanup: remove a bit of clutter.
Change-Id: I758980009df4f7ef86fa2b5e3f4d44ccf3fc3fe3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-08 16:17:58 +02:00
Erik Verbruggen
b0eab0b799 Todo: replace QString::split and trimming by tracking line endings.
Change-Id: Ic9b9ee2075502ea2d9f14b848cb465af948bd166
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-08 16:17:50 +02:00
Thomas Hartmann
99aae36e7a QmlDesigner.Navigator: Fix reordering in case of invisble nodes
If the model contains nodes that are invisible in the navigator
(e.g. QtObject) updateItemRowOrder() does not work correctly.

To avoid complexity we update the subtree in this case.

Change-Id: Ia40ce061e9188ef9ad6ca54ce3444432b878ddf6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 15:51:11 +02:00
Thomas Hartmann
d31b3dcef3 QmlDesigner.Navigator: Crash fix
Objects which are not an Item are not visible in the tree view.
In this case model() is 0 and Qt Creator was crashing when detaching
the navigator view.

Change-Id: I144c940d76157defb27133673ed911d733d8b5ef
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 15:51:04 +02:00
Orgad Shaneh
ee2023ef65 Git: Deduplicate diff editor creation sequence
Change-Id: I9d0751726f0acb340f9b19be62c6bbe23ec460f7
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-08 15:09:02 +02:00
hjk
127d3b9687 TextEditor: Move base of operation from Editor to *Widget
One less level of indirection

Change-Id: I4777bd7d54e572f36a490aeb747a8e0f89599049
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-09-08 14:48:26 +02:00
hjk
0feb80fa00 CppEditor: Re-add check for editor existence in updateFunctionDeclDefLink
Fixes a recent regression.

Change-Id: Iaa4eb936274b33057fc6c8fdcfbe751b9ab28b75
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-08 13:47:30 +02:00
Thomas Hartmann
8c17e3b3a2 QmlDesigner: Fix regression for import paths
The imports paths used by the sub component manger and meta info system
were not correctly resolved. The main reason was that the textDocument in
the text modifiers are just plain text buffers and do not containt
any url for the document.

This patch removes importPaths() from the TextModifier.
The ViewerContext can be stored in the TextToModelMerger and
does not have to be recreated when needed.

Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-08 12:36:29 +02:00
Nikolai Kosjar
9e81bd0b36 CppEditor: Clean up CppUseSelectionsUpdater
* Remove unused member m_snapshot
* QTC_CHECK -> "if (!...)" - the revision might have changed in the mean
  time
* Restore previous document in synchronous case

Change-Id: Ie05c044fbb75e92edbf0fdb041178aadde8113c5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-08 11:55:15 +02:00
Erik Verbruggen
300c48e864 Utils: bring QtConcurrent::run into the current century.
.. by adding support to pass in a std::function (which includes lambdas)
as the function to run. The run function only takes functors that have
a QFutureInterface& as parameter, because a lambda can already capture
anything that would be passed in on invocation. Parameter-less
std::function<>s are already handled by QtConcurrent (in Qt).

To use it, you'll have to explicitly set the template parameter T on the
call.

Change-Id: Ie145fc3245d59fdea9d4703dab155ce9100eff89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-08 11:30:01 +02:00
Christian Kandeler
847f10e9cc Remove Qt version checks.
Qt 5.3 is the minimum requirement these days. Remove all fallback code
from sources and project files.

Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 10:33:25 +02:00
Orgad Shaneh
6f58e5b798 ClearCase: Remove superfluous #ifdefs
Change-Id: I60b091acc3d3d4ee810341a4d9c6067783840f86
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-08 10:14:21 +02:00
Orgad Shaneh
c023a1cac1 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>
2014-09-08 10:13:55 +02:00
Erik Verbruggen
bf33b41da8 C++: set the document field in the synchronous case.
Task-number: QTCREATORBUG-12975
Change-Id: I9a4b8c69e925e288b7b02263c27f9791748bac85
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-08 10:10:13 +02:00
Fawzi Mohamed
8b8911e899 qmljs: find and add singleton and url based registrations in cpp files
parse all qmlRegisterSingletonType variants, and the QUrl based
qmlRegisterType from .cpp files.
Add types for them.
Currently non creatable types are still offered as completions,
and Url and QJSValue registrations do not add any property.

Task-number: QTCREATORBUG-12894
Change-Id: I24f1c6733575a3ff6b93c5fa895180ae73c9e4fb
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-08 10:02:05 +02:00
Fawzi Mohamed
521052be86 qmljs: highlight properties with inline qml components
Task-number: QTCREATORBUG-10892
Change-Id: Ifbf5675ab53de54f6f38c07726f5ad400f6ee9d6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 09:47:58 +02:00
Fawzi Mohamed
0a611e7ce1 qmljs: always add environment paths to the qml vContexts
Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 09:47:42 +02:00
Orgad Shaneh
bca988d81a DiffEditor: Some more regexp cleanup
Change-Id: I3a423d71c03c624d7ba1bde8b8e7d02e3109f8e8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-09-08 09:31:58 +02:00
Daniel Teske
09ee5c7440 AndroidManifestEditor: Split permissions and features checkbox
So that users can individually disable either the automatic adding of
permissions or features.

Change-Id: Ibf11604e8e20454b79533c1cbf3ea59bfe769e5c
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-09-05 16:23:51 +02:00
Tim Jenssen
d6fbffbff0 QmlDesigner: clean up QWeakPointer use
Change-Id: I314519f7458d4b87e2056cca1ce35f8604f1f51f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-09-05 15:16:46 +02:00
Oliver Wolff
f62e1fb36f Fixed font deployment for winphone 8.0
Change-Id: I8d7a2debfec3bbd06780458a29f11031dd9b862c
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-09-05 13:41:23 +02:00
Oliver Wolff
385a65dee4 Fixed creation of mapping files for winphone 8.1
Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
2014-09-05 13:41:16 +02:00
Orgad Shaneh
a5368b3b76 SettingsAccessor: Upgrade both user and shared maps to latest version
Since the merge itself requires the user sticky settings to be
transformed, it must be done before merging.

Change-Id: I7a2c8b7e8c01412b21a156e24d54780f9dce8bbf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-05 13:36:25 +02:00
Tobias Hunger
ac24fd027a IDevice: Add method to check whether a device is compatible with a kit
The default implementation just compares the device's type() with
the device type Id from the Kit.

Change-Id: I7e72737c0b322c3ee11aef6b3a4751bb91e0add0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Benjamin Zeller <benjamin.zeller@canonical.com>
2014-09-05 13:21:33 +02:00
Tobias Hunger
592a28eecd QtSupport: Remove some unnecessary destructors
Change-Id: I9dcd35e257dbbef2b38e0cc08f456f61d9a5a512
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-05 13:21:21 +02:00
Tobias Hunger
569eec5f46 QtVersion: Save unexpandedDisplayName, not the expanded one
Change-Id: I8f364ba1ebad6f364f2b0678fdc98645d09a3770
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-05 13:21:10 +02:00
Tobias Hunger
ae3ded674f QtVersion: Implement necessary CopyConstructor
This fixes a crash when the member m_expander was copied
to "others" but then deleted in the destructor while cloning
a BaseQtVersion object.

Change-Id: I726427fd984ea1a7a9a9c28f855c6e36292cd5d2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-05 13:20:58 +02:00
Christian Stenger
364a663fcc SdkTool: Fix warnings
Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-05 13:20:45 +02:00