Commit Graph

42785 Commits

Author SHA1 Message Date
Marco Bubke
1a0c618ef2 Clang: Don't add non existing files to the file system watcher
Change-Id: I210bb19576cc1b7a6639487f868bcf20065c73b5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-30 14:41:39 +00:00
Nikolai Kosjar
514efee682 Clang: Fix typo in function name
Change-Id: I6f3dd4cb41f52df440ce9d133cc199f6c66b742c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-09-30 14:33:52 +00:00
Marco Bubke
c5941f9fec Clang: Call updateTranslationUnit for reloaded files
If a file is reloaded it should update every translation unit.

Change-Id: Ib61d933e95fcd9fe4d32363ddc06f5edcca55e35
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-30 14:29:29 +00:00
Nikolai Kosjar
26c0d6ab92 Clang: Fix race condition when closing a project
...which could lead to undesired asserts:

    SOFT ASSERT: "!"Got ProjectPartsDoNotExistMessage"" in file
      clangbackendipcintegration.cpp, line 184

Change-Id: If6d67b9f617394ce8f72e7e56699423d47879688
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-09-30 13:29:24 +00:00
Marco Bubke
88b167c5da Clang: Fix premature reparsing
cxTranslationUnit() is starting a reparsing if it is needed so in the best
case it is useless. But it can be maybe harmful if the translation unit
isn't already created.

Change-Id: Ie733edac58ab8f7eccb1611ca1554209f8aa8718
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-30 11:54:46 +00:00
hjk
150af7af4c Debugger: Merge GdbEngine's {run,post,flush}Command
Since we don't keep a local queue anymore, the distinction is
no more needed. Also, this is close to the LLDB side now.

Also move remaining uses of DebuggerCommand::flags to
GdbEngine, since that's the only user.

Change-Id: I61ae0f4e5294e306ab0b202e80f27fb3e3f7a7d7
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2015-09-30 11:41:02 +00:00
Marco Bubke
25bb8411a4 Clang: Add ClangEditorDocumentProcessor::hasProjectPart
Change-Id: Ie08c44315c9d03434384a1fa0b276e22f45a2107
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-30 11:38:36 +00:00
hjk
97b64f6791 Debugger: Add watcher handling in pdbbridge for basic types
Values are passed through plain str(eval(...)), i.e. no expansion
of non-scalars (list, dict, ...) yet.

Change-Id: I21ceab29504e2bb43aef516f9beeca5470500fdc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-30 11:28:54 +00:00
Alessandro Portale
00e081358d Qt Quick Designer: remove some dead code
Change-Id: I8070d1a929de2c176e0954c57dedcdd415bfe22d
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-09-30 10:33:34 +00:00
Orgad Shaneh
7740c31746 Git: Increase delay for mergetool
On Windows it takes more than 500ms to retrieve the first line.

Really wait until we have an entire line then read.

Change-Id: I9f7c222c314ea977179ed549281ef145ba756c73
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-30 10:01:44 +00:00
Eike Ziller
5c77df1268 Merge remote-tracking branch 'origin/3.5'
Conflicts:
	qtcreator.pri

Change-Id: I87576b71cee9f2f4eb856531f1a8816b1d3738db
2015-09-30 11:01:24 +02:00
Eike Ziller
6dca1499ac Allow different destination directory than Qt Creator build directory
This is useful for compiling and packaging plugins separately from Qt
Creator, where we want to keep the structure of the compilation result
the same as, but separately from, the Qt Creator build directory.

Change-Id: I307f119fc7901e00790ec85bfb01cc3ba5fa6e85
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-30 08:55:27 +00:00
Mitch Curtis
e2d0960d77 Add .directory files to git.ignore
These are created by the Dolphin file manager on KDE.

Change-Id: I292bab5fdde43a5bd65f32babbda279c5adeabad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-09-30 08:54:27 +00:00
Eike Ziller
6ed775f56a Fix wrong context help if tool tip was not shown for focus widget
The tool tip never has focus, so it cannot become the IContext that is
checked for context help. So, integrate the help id into Utils::ToolTip
and check the tool tip first when checking for context help.
As a side effect the [F1] button and help id for the tool tip is now also
available for use outside of the text editors.

Task-number: QTCREATORBUG-5345
Change-Id: Id975703caf161d1183c247e8ad8bb693b90fd306
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-09-30 08:25:18 +00:00
Thiago Macieira
b42bd585c4 Revert "Set environment variable QT_AUTO_SCREEN_SCALE_FACTOR in Qt 5.6."
This reverts commit 85e1b4d089. Setting
that environment variable breaks the UI completely for certain
environments. If Qt itself doesn't enable auto scaling by default,
neither should Creator (for good reason, as it apparently  doesn't work
yet on X11).

Worse, Qt Creator must respect the environment settings set by the user,
never override it. This commit was unconditionally setting the auto
scaling, making it impossible for me to override the settings.

Task-number: QTCREATORBUG-15115
Change-Id: I42e7ef1a481840699a8dffff140857f6c0b33713
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-29 17:37:56 +00:00
Alessandro Portale
6781e3c96b QmlProfiler: Remove extra arrow from filter button
Change-Id: Ieba517acc6652b2c188f8ff90558b10a6b8c0ac3
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-29 16:12:48 +00:00
Sze Howe Koh
a031dbfc3d Doc: Instruct user to select the correct template
The screenshot shows the code template for a Qt Quick Controls
Application, not a Qt Quick Application. This led to user confusion:
https://forum.qt.io/topic/59078/

Change-Id: I41580fd4abd337176e704adcb9547d8d4bb4ef7a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-09-29 14:45:45 +00:00
David Schulz
0566b6f63c Editor: Disconnect private editor class when destructing.
Task-number: QTCREATORBUG-15010
Change-Id: Iae3fef08fe0ed42a0eb81cc724f8e5250aedc80d
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
2015-09-29 13:46:11 +00:00
Tobias Hunger
e7cfdb63b5 SubdirsWizard: Make opening of NewItemDialog work again
The subdirs wizard tries to re-run the NewItemDialog to add
subprojects to the qmake SUBDIRS template it created.

Make this work again.

Task-number: QTCREATORBUG-15057
Change-Id: If5c61970afb3bb4507d4a7de7dde1a6e7078c29a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-29 12:58:38 +00:00
Nikolai Kosjar
a7928b4b0b Clang: Integrate clang's fixits as refactoring actions
They are invokable by the usual means (Alt+Enter, editor's context menu
> Refactor) plus by the context menu of the editor's left margin for the
related line.

The fixit text comes directly from libclang and is thus not translated.
We modify the text slighty by stripping the diagnostic category prefix
("note:", "error:", ...) and capitalizing the first letter.

A follow-up change should properly indicate available refactorings with
a refactoring icon in the editor's left margin.

Task-number: QTCREATORBUG-14868
Change-Id: I86157c9f824d2a9dedf19087476d02ad1e6cc854
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-09-29 11:39:21 +00:00
Nikolai Kosjar
de6d7f0617 Clang: Refactor handling of diagnostics
...by introducing ClangDiagnosticManager and the helper class
ClangDiagnosticFilter.

ClangDiagnosticManager will get more state in a follow-up change.

Change-Id: Id2c312bc897ea41ed67292b56b24dcfb7975ff4a
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-09-29 11:38:53 +00:00
Orgad Shaneh
c3772f478c Cmake: Fix MSVC warning
cmakeautocompleter.cpp:113: warning: C4129: '(' : unrecognized character escape sequence

Change-Id: I4dccf3a0690a9c755c1e4672bfa669deaf893be2
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-29 10:33:47 +00:00
Tim Jenssen
e054c7d7db QmlDesigner: remove any use QML1 puppet code from the designer
Change-Id: I7386cc289cced48c1879778ae9ad0ead7bc50469
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-29 07:11:58 +00:00
Orgad Shaneh
e68327666f Tests: Fix MSVC warning
tst_timelineselectionrenderpass.cpp:75: warning: C4305: 'return' : truncation from 'double' to 'float'

Change-Id: I2d8e06338bf69c219020e7d9c7015f52db34877a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-09-28 16:51:47 +00:00
Orgad Shaneh
c77acc6e0a PatchTool: Fix patching files with CRLF on linux
Task-number: QTCREATORBUG-14012
Change-Id: I11db2f86a9c8fb13b3120c380b9d9a0856599d89
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-28 16:51:01 +00:00
Orgad Shaneh
b2dae02762 Git: Enable "Continue Merging" dialog on deleted conflict
When a Deleted conflict is aborted, this prompt appears too.

Change-Id: I8f45363c4875b2d66bcbff93cf53b075d890ba2b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-28 16:50:44 +00:00
Thomas Hartmann
ff39b02115 QmlDesigner: Enabling actions for components
Change-Id: I817aa9640d7eabfa0bc0f73bbd8e666f1c046a99
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-28 16:01:31 +00:00
Marco Bubke
b412eb81ea Clang: Add revision and completion management
Reparsing a document is expensive so we should avoid it by all means. In
this patch we prevent that the same document is send again. It isn't send
too in advance of a code completion if there was no changes before the
the completion position.

Change-Id: I0bb786ba1d4e7ce08611a518cb32f8cf8f4d0037
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-28 15:46:15 +00:00
Nikolai Kosjar
e241444ba3 C++: Comment out a flaky test
The test relied on logic that was reverted with change
915f68deac.

LookupScopePrivate::findSpecialization() gets a "TemplateNameIdTable
&specializations" with a non-deterministic order. Without the extra
logic, the very first entry will be chosen as the found specialization.

The non-deterministic order comes from the TemplateNameId::Compare,
which calls std::lexicographical_compare() with the template arguments,
which are FullySpecifiedTypes. The result of
FullySpecifiedType::operator<() might depend on a pointer comparison.

Change-Id: I8d69d1bb5831145b1c21a5ea848c0043f17ec415
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-28 15:30:16 +00:00
Tobias Hunger
803cca4086 Qbs: Send fileListChanged signal later
Only send the fileListChanged signal at a point where the files()
method will actually return a non-empty list of files.

This fixes one reported issue with the Qbs project, but should
actually fix more than that: The files() list is used in several
places.

Task-number: QTCREATORBUG-15112
Change-Id: I2c8207dccfb70d79f50eb65caba88b1a6a11a071
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-09-28 15:10:13 +00:00
Thomas Hartmann
10859951a2 QmlDesigner.PropertyEditor: Enable layout editing
Change-Id: I3af4a2fcc54e98e99716b03e0a34a520c32a424b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-28 14:35:45 +00:00
Thomas Hartmann
7443b7ca00 QmlDesigner: Fix resource path for item library
Task-number: QTCREATORBUG-15100
Change-Id: Ie145afcfedfee0833fb61443b192fa8fee153ed7
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-09-28 14:09:45 +00:00
Tobias Hunger
cb0128846b JsonWizard: Make template processing more widely available
Change-Id: I2c6eecc5d2a3c5429ce3a6a564d65f24ae3d23eb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-28 08:32:22 +00:00
Eike Ziller
842578f357 Merge remote-tracking branch 'origin/3.5'
Change-Id: Icef35a3d74c03c8a26e4794734801cd107cd9e04
2015-09-28 09:43:46 +02:00
Jake Petroules
d47e790d67 Use built-in QString/CFString converters available since Qt 5.2.
Change-Id: I61d861b446299d5b6f43d283928644296b09ad41
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-28 07:27:57 +00:00
Christian Stenger
133af73b2a TreeModel: Ensure that proxy models or views get notified...
...when the root item is exchanged.

Change-Id: Ic854259902bcfdcf5ec5776ad40b56bca3820bf5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-09-28 07:20:59 +00:00
hjk
e57b0db0f9 Debugger: Add missing #include
Needed in some configurations after 97e9f11387.

Change-Id: I905021575220171ed1d06dfa59873660f695e53f
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-28 07:20:26 +00:00
David Schulz
e4fd6c0bbf ProjectExplorer: Fix compiling windebuginterface.
Broken by 283b2f1c1.

Change-Id: I114de32b1f9fd6487201e01b769d653d5d8ab551
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-09-28 06:44:53 +00:00
hjk
97e9f11387 Debugger: Allow LLDB-MI to be used as debugger
That's LLDB's "compatibility" mode faking a GDB 7.4 interface.

This is not directly needed given Qt Creator's native LLDB support
but might be a useful fallback in some setups.

Change-Id: Ia2c1c731de46b8c668bb0c822f1438fe203aa9c5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-09-28 06:13:29 +00:00
Jan Dalheimer
ac98023275 CMake: Indentation and matching brace insertion for the CMake editor
Adds the following improvements to the CMake editor:
* Indentation support (both through Ctrl+I and when pressing enter)
* Insertion of matching paranthesis and quotes (pressing '(' inserts ')')

Change-Id: If9a63b08b3e0897989e4d8ac69e3acc072b0b825
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-09-26 10:36:00 +00:00
Leena Miettinen
2108b2de6f Doc: Qt Quick Designer features are no longer commercial only
Change-Id: Ic908670b3f8be7491e2639b3a2d524382580d7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-25 14:57:34 +00:00
Daniel Teske
9f2f41e285 Android: Support non distro installations of JDK
The android tools expect to find java and javac in the PATH. Which
is the case on using the distro java, but isn't if the user
installs Oracle's binary jdk distribution.

Change-Id: Ib5f5448724f00b000a969c27d5aad6a420bfc1eb
Task-number: QTCREATORBUG-14155
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-09-25 14:02:26 +00:00
Daniel Teske
9d162bdb16 Android: Be explicit on whether gdbserver should be added to the package
Change-Id: I2a03e243678263441d64884dbd5245b8ec2ba9c7
Task-number: QTCREATORBUG-13035
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2015-09-25 13:52:49 +00:00
Daniel Teske
283b2f1c12 WinDebugInterface: Flush messages on being stopped
I found this while investigating a bug report.

Change-Id: Ic756dfc4b1dfe1b1a647d5b10441391c97046176
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-09-25 13:46:32 +00:00
Daniel Teske
ac4b3f33d0 Android: Change pulling of app_process binary to not use readLink
As apparently Samsung devices don't have it. The new algorithm
is:
- If it is a 64 bit device
  - Either pull /system/bin/app_process64 (64bit process)
  - or pull /system/bin/app_process32 (32bit process)
- If it is a 32 bit device
  - First try /system/bin/app_process32
  - If that doesn't exist try /system/bin/app_process

The old code did a symlink resolution on one of app_process[32|64|],
but I believe the symlink resolution was only needed for a symlink
from app_process to app_process32, which is covered by this code.

Change-Id: Iedeeb247c3059931e1ddf6d01e8b2aab13156470
Task-number: QTCREATORBUG-15006
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2015-09-25 13:28:30 +00:00
Alessandro Portale
dec37e6df4 QmlDesigner: QT_NO_CAST_FROM_ASCII
No need to be special in this regard.

Change-Id: If84ca4c84c1972171ffdc9ee25e426c454c39e6e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-09-25 13:14:06 +00:00
Daniel Teske
b534b2b0b9 QMakeVersion: Fix QMakeVersion::equals
Broke in 8e171e0be0 just before 2.3.0

Change-Id: Ic4f4fe1d904c8a3146962e4276ae7e7bf4ed8895
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-25 13:07:28 +00:00
Daniel Teske
b48f6e6b2d BaseQtVersion: m_qmakeCommand doesn't need to be mutable
Seems to have been the case since forever, but I don't think
this was ever necessary.

Change-Id: Ieaca8d239ad5d0528d45597f6d1b2a437b422fd0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-25 13:07:20 +00:00
Robert Loehning
b92c00bab6 Check in initialize if OpenGl context can be created
Change-Id: I224c2559c1e65cfc3b699e7ec7b56dee8308bd83
Task-number: QTCREATORBUG-15101
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-25 12:23:16 +00:00
Robert Loehning
734725ffc8 Welcome: Check in initialize if OpenGl context can be created
Task-number: QTCREATORBUG-15040
Change-Id: I8c78ac0a3b979c4ec8e088cd1be3c6aeb04ff339
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-25 12:23:02 +00:00