Commit Graph

32962 Commits

Author SHA1 Message Date
Eike Ziller
1e29d5c09e Add freedesktop.org.xml to .pri file for easy access in locator.
Change-Id: I6c408a7f8cf367038140c9d35d7dea8f7e0cd628
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-25 15:01:50 +00:00
Przemyslaw Gorszkowski
9e513774b1 C++: resolved self-value reference for enum
Added support for resolving case:
enum E
{
  val1,
  val2 = val1, // val2-4 are not resolved
  val3,
  val4
};

Task-number: QTCREATORBUG-13932
Change-Id: I122c5eb0b0397d6c02bc3db0a5c1ea1c28c5c6e7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-25 15:01:02 +00:00
Orgad Shaneh
e0eac5824b Core: Avoid unnecessary QFileInfo in OpenDocumentsFilter
Change-Id: I93416ba203b543dd307f1b7db84c8c481aab1ede
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-25 15:00:36 +00:00
Daniel Teske
2ffd0e2d0d ProjectExplorer Nodes: Replace dynamic_cast with as* functions
The OS X linker makes using dynamic_casts across shared object
boundaries fail, so do all casting in the projectexplorer library
and provide functions to do it.

Task-number: QTCREATORBUG-13864
Change-Id: I0e13c0986f8342d83c3b838ffdd2dd7b8312b13c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-25 14:57:18 +00:00
hjk
d1e0324b22 Debugger: Fix GdbEngine state transitions for 'attach'
... to running process. Pretty much the same setup as for
the terminal now, except that we are stopped in the end.

Change-Id: I02c5bf52971dc97fd6393ee67349c9070dc08697
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-25 14:34:26 +00:00
hjk
1b71e8a53d Utils: Remove unneeded double indirection in OutputFormatter
Change-Id: I1af77688172d139cca105ac20086a3b7c5f32df6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 14:25:01 +00:00
Orgad Shaneh
a70a886286 Core: Use a fixed cursor in OutputWindow
Callgrind shows that movePosition is very expansive.

Change-Id: I84fbb59eb10b97e8222b91604b29a420179cf3e2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-25 13:46:33 +00:00
Orgad Shaneh
5044056296 Utils: Use a fixed cursor in OutputFormatter
Change-Id: I3652aac881a7be955f11d57afb783142064ad256
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-25 13:45:34 +00:00
Nikita Baryshnikov
bcdd6d4ca0 SearchResultWindowPrivate: initialize members in ctor
and remove unused variable

Change-Id: I89c042ed834e978a97623a0544b4a6d754d29bc3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 12:56:50 +00:00
Nikita Baryshnikov
1cd37bff95 ThemeEntry: initialize member in ctor
Change-Id: Ic62012104503956b16468718299a24d63594339a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 12:56:29 +00:00
Nikita Baryshnikov
4b49b52c09 EditorToolBarPrivate: initialize members in ctor
Change-Id: Ibbe75d5245e565d3f2258275ba20993e90a21467
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 12:49:07 +00:00
Nikita Baryshnikov
4f3f272d73 FindPluginPrivate: initialize members in ctor
Change-Id: Iebb1597898d3c608e91c7f0b3c11ee139fe3f489
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 12:47:51 +00:00
Orgad Shaneh
fb758183d7 C++: Disable "signals" when qt keywords are disabled
Change-Id: Ib2334703247a4003015c7063730e0343054d3543
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-02-25 12:44:27 +00:00
Nikita Baryshnikov
df2edde762 ActionManagerPrivate: remove unused member variables
Change-Id: I92cd512bafd8030735c3c51e4c973a2f3b858189
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 12:42:58 +00:00
Orgad Shaneh
a1c9654349 Utils: Pimpl OutputFormatter
Change-Id: I42682a9793e895fb99b154cf9fac37fb189fd9c8
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-25 12:04:12 +00:00
hjk
7b8c58b99b Debugger: Fix a state transition regression
Task-number: QTCREATORBUG-14028
Change-Id: I426baf1549d138f4a35d23d5ab814def2125dfbe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-25 11:32:54 +00:00
Jarek Kobus
30d80ad020 Use completeBaseName for operations on paths.
Task-number: QTCREATORBUG-13967
Change-Id: Ie70f861138f1cf4c3f098a363274cb99bcf97c03
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-02-25 11:19:53 +00:00
Nikita Baryshnikov
ed271ed750 ClearCaseSettings: initialize member
Change-Id: Ib43dbddd64bb179f65d25705757682f6a8088af0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 11:13:31 +00:00
Orgad Shaneh
169fe15940 Core: Pimpl OutputWindow
Change-Id: Id19f3d0ffcc1b3c939d57c9cb2c5b0fa7be7203c
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-25 10:54:36 +00:00
Nikolai Kosjar
eeee955061 CppTools: Display explicitly marked slots first
...when offering Qt5 style slot completions.

Change-Id: Id23b008601ade3533aea2b6295558ffea178a5da
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 10:50:22 +00:00
Nikolai Kosjar
7bd055d446 CppTools: Display icons when completing signals
...and their class names.

Change-Id: I41b4705eb572d9d6431a06025e73b0c1621d4bea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-25 10:49:53 +00:00
Nikita Baryshnikov
00aa57b20a BookmarksPlugin: initialize members in ctor
Change-Id: Id5aa974e24baf639dd75979193c6bd6f4c86d2b6
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-25 10:49:02 +00:00
Eike Ziller
767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb
2015-02-25 10:15:28 +01:00
hjk
c6a4c80728 Debugger: Remove a few unneeded Q_SLOT macros
Change-Id: I7be999999f891a003c940d585762d15a76bf90a1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-25 06:55:14 +00:00
hjk
6696bf1374 ProjectExplorer: Fix recent regression with an old-style SLOT
Requiring Qt 5.4 would be nice...

Change-Id: Iae2ef187bc4c6a30137448ad60109ed44b130fb4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 16:35:37 +00:00
Eike Ziller
d156103d8d Editor manager: Fix selected filter in Save as...
Make sure to ask mime database only for mime type of non-empty paths.

Change-Id: I5de896021c8438f17b1c5368674493337ccee0c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 15:25:53 +00:00
Tobias Hunger
6c49356471 JsonWizard: Allow for descriptions of wizards
Allow for descriptions of project wizards that will be displayed in the
Project location page.

Task-number: QTCREATORBUG-13924
Change-Id: I7d65aba0e07f074cc0935318cff9b93f166a1c51
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-02-24 14:56:21 +00:00
Eike Ziller
5b98fcf7f9 Mime types: Fix opening files with mime types with multiple inheritance
It was opening e.g. ruby files in the binary editor because the ruby mime
type inherits from application/x-executable (which inherits from
application/octet-stream) as well as text/plain, and it was searching
depth-first.

Task-number: QTCREATORBUG-13996
Change-Id: I1980d7ed04fabf111f8fb76df657225ae9ebe552
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 14:46:54 +00:00
hjk
da8270e1d0 ProjectExplorer: Move private slots to Pimpl
Change-Id: I62a8f4f0e94b3e9f85e9a88f3447c5fbfdd38295
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 14:45:32 +00:00
hjk
2ee4363d1d Debugger: Force LLDB round trip between stack and locals update
The stack might produce data (such as as the QML context in
native mixed debugging) that is needed for locals display.
While this doesn't work yet with LLDB anyway, the change
suppresses one soft access when accessing the top frame of
an empty stack (the usual case on the first update).

Change-Id: If931fbe940b8cda01cc6cc34429a2fcb33cd8d19
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:31:32 +00:00
hjk
37bd3eab24 Debugger: Visually fake instant breakpoint removal
This partially reverts 38ec4dd6ae.
After using the new, "correct" behavior for some time I am
convinced that the original felt indeed better.

Change-Id: Ia921ccf8410bec33eb3053dc91bcca7b0328ef38
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 14:31:23 +00:00
hjk
592ffe7377 SettingsDialog: Remove CategoryId parameter from callers
PageIds are supposed to be unique, so the CategoryId can be determined
from the PageId. Look for PageIds in the already expanded categories
first before searching through expensive categories.

Change-Id: I006beb0df6183453163ac1810fe59a306a0f52b1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-24 13:52:00 +00:00
Tobias Hunger
655eed467e QmakeProjectManager: Fix typo in method name
Change-Id: I63a1ca0c9fd4ef1a6af758179e315fc7ec96eeb4
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 13:39:26 +00:00
Tobias Hunger
86b5b5c2f3 VcsBaseSubmitEditor: Remove queued connection
Those should no longer be necessary and some people report warnings
about queueing Qt::ApplicationState when doing commits in creator.

Change-Id: I7bf1be57b8a92212ef677d1a608c0f22d20cab8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 13:39:18 +00:00
Orgad Shaneh
fa9deea671 Core: Minor optimizations in DocumentModel
Required for followup changes

Change-Id: I6280427433bd88fedf87e4d8d25c2f7481d94210
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 11:58:02 +00:00
Alessandro Portale
fb567a224d Fix layouts for OSX: Set the obligatory ExpandingFieldsGrow
In Qt Creator, we want line edits to take up the free horizontal
space.

Change-Id: I4ff78035ab2481cc2f944fc02569638f06f0b090
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-02-24 11:45:53 +00:00
Christian Kandeler
e5784b6964 QbsProjectManager: Set cpp.compilerPathByLanguage.
To work around the "-x" bug in icecream.

Change-Id: I7d95aa120ad344f6662c265fe81ab98752c7cd1e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-02-24 10:53:11 +00:00
Alessandro Portale
cf82da2b91 Gerrit Push Dialog: Let Commits list take the free space
When resizing the dialog, the Commits list should take the free
space.

Change-Id: I6586f43f8f43a4563327867e29630626f4a6e00a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-02-24 10:32:35 +00:00
Eike Ziller
8b17f10cd4 MimeDatabase: Fix remaining problems with overriding mime types
If mime info is requested during Qt Creator's initialization cycle, the
mime files might be parsed before all custom types are registered. To
ensure that custom mime types override the built-in ones we must force a
complete reload after they are registered.

Change-Id: I94032a5efe1bbc22885cbeb1f43080270c23381c
Task-number: QTCREATORBUG-13995
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:47:06 +00:00
Eike Ziller
4e53c23b4b Mime types: Fix that some QML files were opened as C++
We registered a mime type "application/x-qml" conflicting with "text/x-
qml" from freedesktop.org.xml. The magic matcher of the C++ mime types
might kick in, in that case.

Task-number: QTCREATORBUG-13994
Change-Id: I5900c233b42681d7b7d3af185d6ff3e1c4166e59
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 09:46:04 +00:00
hjk
53de7045ae Debugger: Fix some LLDB breakpoint state transition
Breakpoints inserted before application start are not
just 'InsertRequested' but already 'InsertProceeding'.

Change-Id: I1df37d15f74ea65771843f6eab2e724d2bb0cd23
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-24 08:59:34 +00:00
hjk
45b58ac2e8 Use Qt5 connects in ProjectExplorer and Session
This is a first, self-contained step only: Replac the connects
themselves, rename private slots that coincide with
signal names, apply minimal compile fixes and formatting.

Change-Id: I0a28d2ebcf4d4f6fdf68a06f582ed962ed54724d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-23 18:07:43 +00:00
Christian Kandeler
0c22a610de Update qbs submodule.
To HEAD of master branch.

Change-Id: I6991c6dc4d39beb47dbf8b66e6dff7715369e765
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 16:53:08 +00:00
Tobias Hunger
3232af6272 DiffEditor: Fix selection of next view
Change-Id: I3754bb3637fc89d4c9ef2939db25dd1fda9d3243
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 15:02:29 +00:00
Tobias Hunger
f9f6f0b2c9 DiffEditor: Introduce a base class for the different views
... of the diff. Currently that is side-by-side and unified, just
as before.

Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-02-23 13:28:08 +00:00
Christian Stenger
7121315a71 Utils: Fix propagation of underlying tree model
Change-Id: I23739cb4c7a19a5c5bcdc8bf39c36db689292b62
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-02-23 11:52:56 +00:00
hjk
54ce123a26 ProjectExplorer: Add runStartupProject() convenience function
The usage pattern seems to be used often enough to justify a function.

Change-Id: Iecdeb2b42879f419154902e685d0d13e8cae8b33
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-23 11:01:56 +00:00
hjk
6fb766bf43 SettingsDialog: Modernize connections
Change-Id: Ie157b9b36a13b3e6eba5c158040e7491bd2ff29d
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-02-23 10:54:39 +00:00
Christian Kandeler
1104a6602b Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: Ifce05da069397336b21081d797de07dcaf4d96fc
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
2015-02-23 09:59:39 +00:00
Christian Kandeler
25a14aa2e2 RemoteLinux: Use QtcProcess::join() to display argument list.
Otherwise, we lose quotes on a round-trip.

Task-number: QTCREATORBUG-14002
Change-Id: If7ecd17dfcb310aa10d9f83ddbd215c5b7136546
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-02-23 09:58:31 +00:00