Commit Graph

36701 Commits

Author SHA1 Message Date
Marco Bubke 2e907e44f1 Revert "QmlDesigner: Using QQuickWidget in the Property Editor"
This reverts commit eb5edae8eb.

Because we get crashes with QQuickWidget

Change-Id: I63546f4c59e382019cb8524e32071dc9ad8fd171
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:10:48 +02:00
Marco Bubke 2b96e1b96a Revert "QmlDesigner: Use QQuickWidget in states editor"
This reverts commit 7d43664958.

Because we get crashes for QQuickWidget

Change-Id: Id3ff197bf5452abefad07dbadb4f7a509f117dfb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:10:33 +02:00
Marco Bubke e832b465fd QmlDesigner: Fix compile lines
Change-Id: Ib7b344a11ddcceb5822676cf0bee1e01d9122a2b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:10:12 +02:00
Marco Bubke a6ee8a1e54 QmlDesigner: Improve speed of puppet compiling
Change-Id: Ic6e73e5ec285b3ff77976e3e3b295ec6a31b3ceb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:10:05 +02:00
Marco Bubke ecbf0a485d QmlDesigner: Using separate channels for puppet creation
We want only count the compiler commands to get a reliable progress bar.

Change-Id: I99ce26cba857bdd143892d9e9e6d86b7278d63f9
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:09:58 +02:00
Marco Bubke b04304ee11 QmlDesigner: Slow down the preview timer
The painting is slowing down the form editor.

Change-Id: I71afbefff353d23bd25fb9877ee70b896b73b378
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:09:49 +02:00
Marco Bubke fa941e1e16 QmlDesigner: Don't restart the puppet with debugger attached
The debugger is stopping the alive commands so the puppet is restarted.

Change-Id: I80e8f0ea4d47dd49e15f41471410dded33355579
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:09:43 +02:00
Marco Bubke b4e251fdad QmlDesigner: Improve style of states editor
Change-Id: Icbe8a6cb4713ec23bd7eb8ed7e9bec862822716c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-07 16:09:35 +02:00
Fawzi Mohamed c1691a7590 qmldesigner: interpret undefined versions as 1.0
Change-Id: I73da6f6cf6dd2e67b9550f2f2bb29d344884cfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-07 16:03:27 +02:00
jkobus e4ff24ea31 Handle similarity index in git commits
Task-number: QTCREATORBUG-12619
Change-Id: I5af39f18bc02ce1f06bf72f155bf0aaabe8b228d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-07 15:49:43 +02:00
Christian Kandeler bf526f4cd1 Ios: Enable plugin for qbs build.
There is no reason why for qbs the plugin should be built on OS X only,
when the qmake build has no such restriction.

Change-Id: I8486ac20b6708c542b2920e946446ba382e0b75c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-07 15:46:02 +02:00
Kai Koehne 50a76930c2 ios: Fix MSVC compiler warning
Fix warnings about const argument in virtual method signature:

src\plugins\ios\iosrunfactories.h:70:
warning: C4373: 'Ios::Internal::IosRunConfigurationFactory::doCreate':
virtual function overrides
'ProjectExplorer::IRunConfigurationFactory::doCreate', previous versions
of the compiler did not override when parameters only differed by
const/volatile qualifiers

This apparently was missed in 93304df038

Change-Id: I3402b6b4899d963dc8270e959de0e8dcbb0c15b1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-07 15:29:41 +02:00
Fawzi Mohamed 7f91cf58b9 qmljs: put file specific logs in anonymous namespace
putting file specific log categories in anonymous namespace
avoid the possibility of nameclashes.

Change-Id: I17a07015ffe1c539824fcfcbc2296335d9225dd1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-07 15:03:00 +02:00
Fawzi Mohamed 0664aa146b ios: convert to new logging infrastructure
Change-Id: Ia62a585acfb55c35aa859553d24cb0e20600b46a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-07 15:02:27 +02:00
Ulf Hermann 730997b2d8 QmlProfiler: Document restrictions of SortedTimelineModel
SortedTimelineModel only works with perfectly nested ranges. Specify
what that means so that we don't stumble over it for the (n+1)th time.

Change-Id: I77f276ba9152fb023d875d0f326e7d646945d3a7
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-07 14:33:05 +02:00
Przemyslaw Gorszkowski 4aa4e64b77 C++: base class and default argument for template class
Fix code completion in case:
struct Foo
{
  int bar;
};

template <typename T1 = Foo>
struct Derived : T1 { };

int main()
{
  Derived<> foo;
  foo. // members from Foo are not proposed
  return 0;
}

Task-number: QTCREATORBUG-12605
Change-Id: Ibe35c7b9a161e789057a4518c72390ac52489a3e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-07 13:26:14 +02:00
Erik Verbruggen 87dcde5564 Clang: fix Qt4 build.
Change-Id: I0687ec440df7f6ead629e1d0ded4fc9b925c98e5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-07 11:28:46 +02:00
Mitch Curtis 3c5026b73d Fix typo, group related sentences in qtquick-screens.qdoc.
Change-Id: I2b83b0f42e71b8d7fb55d857e0d14d3e07af9fa1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 11:19:17 +02:00
Orgad Shaneh e7643e351c ChangeLog: Add some more changes
Change-Id: I97dce495081849c92b7bba50f9008da4e7429cad
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 10:55:53 +02:00
Eike Ziller 757a8cf2a3 Fix spelling error
Change-Id: I82e9a3c06cf9836cb2c6f8c76720f49f97286d83
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 10:39:32 +02:00
jkobus 5ebd59d12b Rename some methods and variables in DiffEditor
Change-Id: Ic6db2882c9468b9451a785e4657e4255b40fca4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-07 10:34:17 +02:00
jkobus 91e4271069 Hide reload button for diff editor when there is no reloader
Refactor code a bit. Now DiffEditorController has a pointer
to DiffEditorReloader.

Change-Id: I224579127f112923bc665cd59717b0c4d833981b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-07 10:34:11 +02:00
Ulf Hermann cb7963bc18 QmlProfiler: Make events view properly sortable
Add all the missing bits and actually use the filename for sorting.

Change-Id: Icc2a07d297fe17423aa23bf58a602dfa0dcf5a87
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-07 10:26:19 +02:00
Ulf Hermann 6a93d41831 QmlProfiler: Make V8 view properly sortable
Don't accidentally reuse the EventViewItem class from the events view,
drop the column number as it's always -1, and actually use the file name
for sorting instead of random junk. Also add all the missing bits
necessary for sorting all tables by any column and drop the hash string
as it's useless.

Change-Id: I26dcdd229f1f1ef18f68edcb6edfb0427a2e2e6f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-07 10:26:15 +02:00
Eike Ziller 0100237a33 Coding rules: Add guidelines for lambdas and auto
Change-Id: Ie15c848361c8135d83ff3eb20323e51a820b5dbc
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-07 09:51:25 +02:00
Fawzi Mohamed e53161568b qmljs: avoid using threadusafe Project::files
Change-Id: I697efaedde6d10be3f1b435f8de30ab4ede2bd62
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-07 09:30:21 +02:00
Fawzi Mohamed 52cb3d5a7a qmljs: improve handling of default values for AnyLanguage
Change-Id: I97ae24c386a6316b32b8213ab5fc5cb5c6800c65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-07 09:29:51 +02:00
Orgad Shaneh def9695e42 Fix Qt4 compilation
Change-Id: I59f5e4ceec008adedb6f548502c7c90854c033ab
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-06 07:21:48 +02:00
Christian Kandeler 6d0e12be19 Fix qbs build.
Remove left-over references to Find and Locator plugins.

Change-Id: Ica0d9c4eff0c7da6c92e4ef7d74ef3874c8dfb20
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-05 08:45:07 +02:00
Orgad Shaneh a22d281cc6 CppEditor: Add failing tests for "Move Definition Outside Class"...
... when macros are used in function definition

Task-number: QTCREATORBUG-12314
Change-Id: I811f93cde3dffa75fb71684569706f284939d7f5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 16:39:29 +02:00
Ulf Hermann 52ef14190e QmlProfiler: Update documentation
Quite a few things have changed and the documentation should describe
them correctly.

Change-Id: I21a1f81022f21500c069b641744a37eef9eaa6b9
Task-number: QTCREATORBUG-12590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-04 16:14:40 +02:00
Marco Bubke d74521d0ae QmlDesigner: Use Rectangle instead of Item for dummy Window
Task-number: QTCREATORBUG-12484
Change-Id: I6d96367159dd813531046af4412bc10e5cb5df0f
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 15:43:01 +02:00
Marco Bubke aea7f77af9 QmlDesigner: Show context menu in the states editor in whole view
Change-Id: I656c803f066bcdf1b3b39879194cc4698832083b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 15:41:45 +02:00
Eike Ziller df6c07694f Locator: Fix case sensitivity of file system filter
Since the path must have correct case (for case sensitive file systems),
we should only take into account if the "file name" part of the search
string is all lowercase or not.

Change-Id: I6bd49f7ac37cbdd39b995a75f1b81083c9df74d3
Task-number: QTCREATORBUG-10843
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 15:21:58 +02:00
Marco Bubke d38eabac03 QmlDesigner: Add sorting to item library
Task-number: QTCREATORBUG-12603
Change-Id: I883a343d2d7c6cd563d383f7833881db563a0e4a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 15:11:33 +02:00
Nikolai Kosjar 1b31286932 CppTools: Fix compilation with MSVC
Change-Id: I81e966414f7b2060b86879b696918227eac13a73
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 14:59:06 +02:00
Marco Bubke 40749b8483 QmlDesigner: Use close instead of hide for process dialog
Task-number: QTCREATORBUG-12601
Change-Id: Id5e444d05fa93984839abef6a72f659c61aca0b5
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 14:43:57 +02:00
Jerome Pasion 026ea56bff Doc: Adding Qt Creator's URL in qt-project.org in qdocconf file.
-can be used for referencing Qt Creator's pages from other
 QDoc projects.

Change-Id: Ifdb82a8995976580876523f5bd6efb688bdfb9b1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-04 14:40:49 +02:00
jkobus 656c3343ee Make it possible to save diff editor contents
Task-number: QTCREATORBUG-12548
Task-number: QTCREATORBUG-12549
Change-Id: Ia27080cc689da48fc5401010e2277edaf0a01f4d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-04 14:31:01 +02:00
Marco Bubke 337c1b3b69 QmlDesigner: Tweak item library
Change-Id: Ia9f689c33e9590815cbd00bdf13d0d05466d37d0
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-04 14:22:38 +02:00
jkobus f07cb7ae3a Fix double click on removed lines in unifieddiffeditor
Task-number: QTCREATORBUG-12493
Change-Id: I31c63cfb5f05e73595fc42eef258998e2783697a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-04 14:16:21 +02:00
Fawzi Mohamed 9a60137448 qmljs: add explicit typeName to exports
Change-Id: If777f312c6532db9a37214f173c10b5542c02e60
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:06:22 +02:00
Fawzi Mohamed ef54a29c7b qmljs: add possible exports given by its path if no other exports found
Change-Id: I23c99aacf0c76fe9ceca0c7c05c17102b90244cd
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:05:16 +02:00
Nikolai Kosjar 04d655dee0 C++: Fix preprocessor line offsets
In TranslationUnit, the "normal" lines are based on utf16char offsets,
but the preprocessor lines were based on byte/latin1 offsets.

The preprocessor lines are now based on utf16char offsets, too.

Task-number: QTCREATORBUG-7356
Change-Id: I3c41d1dcee8e9e487210f36da806b0229d3f4cd0
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 14:03:44 +02:00
Fawzi Mohamed fa24266972 qmljs: improve handling of relocatable dumps
Change-Id: Ie329911a3f7f9266ead41087cbc7d78b95c1497a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:03:30 +02:00
Fawzi Mohamed c44cffa49d qmljs: eagerly import library typeinfo
Change-Id: I599b84e9938d021343cca1cdb7d54d53155eaf91
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-07-04 14:00:20 +02:00
Nikolai Kosjar 26a9f01d72 CppEditor: Check for a valid document
...from the semantic info before trying to use it.

Just after opening a file and using Follow Symbol the semantic document
might not be yet calculated.

Change-Id: I62deaf86415a2e2b0d7f1285f90bdcd9b5925a2e
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2014-07-04 13:53:04 +02:00
hjk 26f98097cd Bookmark: Save after internal changes
Task-number: QTCREATORBUG-10687
Change-Id: Ie2cb0b990d7dd419f27469612cb422e55e7d322f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-04 13:52:34 +02:00
Erik Verbruggen 3d33886e53 C++: fix include/framework path handling.
Instead of having two lists of paths, now only one list is used where
both include paths and framework paths can be mixed. This reflects the
way the compiler is invoked, and retains the (correct) search order.

Task-number: QTCREATORBUG-11599
Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 13:51:36 +02:00
Christian Stenger 76152088e9 Debugger: Fix race condition
When getting debugger finished after a device disconnect it might
re-enable the 'Start Debugging' button although debugging is
not possible.

Task-number: QTCREATORBUG-12585
Change-Id: I8901b440bb3e90e5f29cdeba2f6629d157c2e335
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-04 13:46:08 +02:00