Commit Graph

38241 Commits

Author SHA1 Message Date
Christian Kandeler
d5cec7c9f0 Documentation: Remove "maemo" from file name.
The URL should reflect the contents.
Also rename the respective qdoc file.

Change-Id: Ief0092717ab780e99bb378ac874523879a745731
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-09 11:25:13 +02:00
Thomas Hartmann
61b699b336 QmlDesigner.Puppet: Adding size hints to Window mockup
Without defining the properties, the properties do not work and
do not get notified properly. They are also missing defaults which
breaks "resetting".

Task-number: QTCREATORBUG-13004
Change-Id: Ib36f39770930be486225b45169d2ebdb53df8df4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-09 10:38:07 +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
Thomas Hartmann
34fb3d6a5a QmlDesigner.PropertyEditor: Change step size for reals
the default step size of 1 does not make much sense for reals.

Task-number: QTCREATORBUG-12985
Change-Id: I28be2ca8de37f1032e8fbbe785913ae5a8f6be33
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 15:45:04 +02:00
Christian Stenger
bfdbd9c1cb Templates: Remove wrong version information
Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 15:26:13 +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
Thomas Hartmann
b66155cf17 QmlDesigner.PropertyEditor: Change default editor for color
This template breaks the layout and is currently unusable.
Therefore we replace it by a string editor.

Change-Id: I0818d006a4516f34954d5406ee4074664e909891
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-08 12:17:24 +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
Robert Loehning
fdfb9338b6 Squish: Stabilize tst_CSUP06
Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-05 13:00:12 +02:00
Robert Loehning
1f3d7c9e61 Squish: Include new Qt Quick templates
Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-09-05 12:27:12 +02:00
Orgad Shaneh
90f1b03dd7 Fix compiler warning
Unused parameter

Change-Id: I44061c781f1a31082510bf97638f803277921565
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-05 12:00:09 +02:00
Orgad Shaneh
6f2d11ce41 SettingsAccessor: Store sticky keys per map
Setting one BC's qmake arguments doesn't mean all qmake arguments in this project
should be sticky.

Change-Id: I216a35bffdbb523f53d162a918e185cb93585c4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-05 10:08:37 +02:00
Orgad Shaneh
79d5c78a45 SdkTool: Fix "get" for complex types
Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-05 10:05:22 +02:00
Christian Stenger
9276e6a0c0 CppTools: Fix warning of connects and execution of plugin unit test
Change-Id: I3057e3b198d566f57e991103c18ce077babcc4f0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-09-05 09:51:25 +02:00
Kai Koehne
bed2c39bbe Fix keyboard selection shortcuts on Qml/JS Console
Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011
Task-number: QTCREATORBUG-12956
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-04 20:58:54 +02:00
Vicken Simonian
caa56ea0fa Editor: Draw column wrap line after drawing ifdef blocks
Task-number: QTCREATORBUG-12940
Change-Id: I431176c1879236bc107a2c1db11890da5d75f750
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-04 17:25:43 +02:00
hjk
aba1d0a1cb Debugger: Use hard string limit for displayed strings
Currently 100000 to balance between usability (~14sec here)
and usability (e.g. size of typical source text files)

Change-Id: I8a54c81b104a87ec03babf85cbda2e6cea7d3f70
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-04 17:19:37 +02:00
hjk
caca06adbd Debugger: Prevent multiline Value entries in Locals and Expressions
Change-Id: I8647875aa3cb31ecc0d89064c196df7852693bae
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-04 17:19:28 +02:00
Kai Koehne
f2108c6ae3 QmlJS: Don't translate debug output
Change-Id: I979427a5092fe15c1595a9a67c1d31bbe1911ab6
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-09-04 16:20:41 +02:00
Daniel Teske
53db457521 ProjectFileVisitor: Make faster
Instead of checking if a file is unique with a O(n) operation per file,
do one pass at the end after sorting. This makes opening qtproject.pro
roughly ~7% faster.

Change-Id: If30bdeb8f72e5b28fb900e8e7a45bddb5f9f7822
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-04 16:11:59 +02:00
hjk
ec54444b7a Compile fix
Change-Id: I611a357c7a24cceb216486f9ef15389c3950635f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-04 16:06:34 +02:00
Erik Verbruggen
cc70b603d3 C++: Change QStringList to QSet<QString> to prevent conversions.
This eliminates a bunch of list->set->list conversions. Especially the
ProjectInfo::appendProjectPart takes lots of time converting for every
part added.

Change-Id: Ib3c8cd4b0ad6c012ccbeed12ebedd46b9b6cca95
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-04 15:59:40 +02:00
hjk
50e951dcb4 ProjectExplorer: Streamline the canRun(Project) functions
There's no real need to go through the chain of decisions
a second time to retrieve a message.

Change-Id: Id32ee486a7555f8eaf38668f23ec8fb2e179db89
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-04 15:57:44 +02:00
hjk
3df7f9498a Designer: Compile fix for MSVC after recent refactoring
Change-Id: I648007a69cff303499235d0d1e5668b97fd2907e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-09-04 15:46:04 +02:00