Commit Graph

42790 Commits

Author SHA1 Message Date
Tobias Hunger
95b0dc9120 Utils: Move template file processing from projectexplorer to utils
I want to use it e.g. for snippets and the TextEditor plugin may
not depend on the ProjectExplorer, so the code has to move.

This adds a dependency on QtQml to Utils, but that does not really
matter since that is loaded into QtCreator anyway.

Change-Id: Iada9f40b2966a1fc41631ab33da09812ad67d967
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-12 11:53:01 +00:00
Aleix Pol
b899684a89 Don't put QString in static attributes
It crashed in some places on our code-base due to the so-called "static
initialization order fiasco".
As a solution, it turns the variable into a function. This shouldn't have
a penalty due to QStringLiteral.

Change-Id: I9f8a955afdff878dc2f0db16fec861d81250c243
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-09 17:09:45 +00:00
BogDan Vatra
954cabdde8 QNX: Return the computed env vars.
They are needed to fix compilation of qnx apps from QtC. The mimicked
env vars are not enough to build qt apps for qnx660, so let's try to
return the right env vars, otherwise fallback to the old implementation.

Change-Id: I9cd0bbf18cea2ac51035f4cbc88c7e4063355830
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-09 15:46:02 +00:00
Benjamin Zeller
465722be78 CMakeProjectManager: Remember the preferNinja setting
There was a problem in the CMakeSettingsPage that prevented
the preferNinja setting to be remembered. This patch fixes
it.

Task-number: QTCREATORBUG-15162
Change-Id: I9ffaa67e05f2c99b5e9136f3c98004c68d03dede
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-09 15:43:57 +00:00
BogDan Vatra
987d6aedbf QNX: Fix mkspec name
Starting with Qt 5.3.0 the mkspec was renamed to "qnx-armle-v7-qcc".

Change-Id: I977c4666ce13cb2f1fb70497a7697b96f64780e0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-09 13:42:20 +00:00
Orgad Shaneh
70d3fd8271 Core: Fix compilation
Change-Id: If82fd41246a771558a270ab19a1bf8b07ee5c3b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-09 12:07:17 +00:00
Jarek Kobus
ef7cffc29c Quote paths when needed inside addLibraryWizard.
Task-number: QTCREATORBUG-15140
Change-Id: Ieda19112ed74d81fa113e8526a50f49ab964f819
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-09 12:01:51 +00:00
Eike Ziller
57ae75061d Allow packaging additional 7zips in the installer
Change-Id: I435602671ef5cde46580d4ca383930951765ebde
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-10-09 11:33:21 +00:00
Eike Ziller
9a69a05f9b Core: Allow adding additional information to about dialog.
Purpose is to get rid of hard coded license information string in the Qt
Creator binary.

Change-Id: I867e2aed010f8a622adfbb89ac96dccbc8229161
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-09 08:35:12 +00:00
hjk
525c33f999 Debugger: Infrastructure for reworked native mixed debugging
- Remove old experimental native mixed approach.
- Move some common stack parsing to Stackhandler.
- Mark gdbbridge.py debug output explicitly to remove it
  from actual reponse handling

New native mixed needs QtDeclarative changes and
QTC_DEBUGGER_NATIVE_MIXED=1 for now.

Change-Id: I09eed1da51cea878636d36756015b7bfaed34203
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-09 05:19:45 +00:00
hjk
ea39476ef2 Debugger: Do not try to treat labels as variables
They produce no values later anyway and are slow to process.
With this patch, stepping in VME::run from qv4vme_moth.cpp
takes about 1s instead of more than 40s previously.

Change-Id: I5c96966612bdb7c0120d9ebb545d6e8483cbf843
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-08 14:20:59 +00:00
Tobias Hunger
a004cfbdd0 ToolchainFactory: Remove unused typeid
Change-Id: Id13787d549312251fbe806076b9ad594ab16c2d2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-08 09:38:30 +00:00
Jochen Becher
051bbb1cd0 Todo Plugin: Add showing To-Do Entries for current sub-project only
Change-Id: Ia0c84ef62f833b7967985c0913584ca6ccb03ed1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-10-07 17:11:55 +00:00
Orgad Shaneh
c2b34fb1ef Debugger: Fix "Repeat Last Command" button
Broke by 150af7af4c.

flags must be stored with the command.

Change-Id: If2bac648d7d4b2c341eb6398d92b05660f519114
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-07 13:25:37 +00:00
Eike Ziller
3286113ea8 Merge remote-tracking branch 'origin/3.5'
Change-Id: I4d74ad26046136ff2d38cfc1015b502009b2b344
2015-10-07 10:54:25 +02:00
Lorenz Haas
022a81da7a CppEditor: Add filter option for InsertVirtualMethods' dialog
If a base class contains many virtual functions it's sometimes hard to
find the right method. With the new filter above the list of functions
one can now easily navigate to the appropriate method.

Change-Id: I2ddb99fdceef5679b15fc4819f8a69dfa6ae0a0c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-06 13:24:53 +00:00
Daniel Teske
307061032c Fix changing "#include" lines after file renaming
Didn't work if there was any folded text before the #include.

Change-Id: I8f16205f06bfaa8b8541401a9ebd5995c15b2227
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-06 13:17:55 +00:00
Daniel Teske
5eb8fe0306 TextEditor: Fix memory leak in CircularClipboardAssist
Change-Id: Ib32d7f4c25c9012fbcb76db9e3af7446cf0a2505
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-06 13:07:31 +00:00
Thomas Hartmann
de0ed107a2 QmlDesigner: Adding layouts to doResetProperty()
Those have to be hard coded in our code.

Change-Id: I2bdaec0716aeca56df9476f124a47e2dfc1658cb
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-06 10:16:20 +00:00
Marco Bubke
6cbee0ede3 Clang: Add fileContainer getter
File containers were generates in many places. To reduce the noise this
getters are introduced.

Change-Id: I059745c27ac2dd0515bc23b3438d6d264ba071d7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-05 10:37:26 +00:00
Eike Ziller
8f3f95c520 About Dialog: Remove useless spacing if not all information is available
Change-Id: Ie7a923dd28d7989a982d7e695199616d8f8fbbfb
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-10-05 08:57:40 +00:00
Robert Loehning
1d88042b3f Squish: Remove dir separators from expected project tree
Project tree displays native separators since
d7a373ef26

Change-Id: I75a9b391641a20f32000f909b5310ad702ab0ee3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-05 05:41:59 +00:00
Robert Loehning
f885286d22 Squish: Update expected project tree for qtcreator.pro
The handling of .pri files was changed in
51ba32bccc

Change-Id: I581bfa00465e1d9f3c4bbcdfefa4d64555d48c73
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-05 05:41:52 +00:00
Claus Steuer
158b07c9c8 C++: Support noexcept operator
The code model failed to parse the noexcept operator which is often
used in noexcept specifiers, e.g.: "void f() noexcept(noexcept(g()));"
Consequently some c++11 headers such as unordered_map, array
and unordered_set could not be parsed and no code completition was
available. I have created the NoExceptOperatorExpressionAST class
which is created whenever a noexcept token is found in an
expression with operator precedence. The noExcept test case
in the cplusplus/cxx11 test now contains a function that
uses the noexcept operator.

Fixed noexcept operator parsing

Added the test requested by Sergey Shambir, which then revealed that
i had not implemeneted the noexpect operator parsing according to the
c++ specification.
As stated here http://cpp0x.centaur.ath.cx/expr.unary.noexcept.html
the noexcept operator is a unary-expression that contains an
expression (and not a constant-expression). This should now be fixed.

Change-Id: Id4a99a43b660bd83e7680274491d99a698b57094
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-03 17:24:45 +00:00
Jake Petroules
b1f6974954 Improve error messages in iOS deployment tool.
Change-Id: I94f945d1247a9d5d43119de2a53af33a7b1b25c7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-02 17:40:03 +00:00
Robert Loehning
a835b51407 Centralize checking for OpenGL
Change-Id: Ic2212c8519f4c771ba3e3c61dd32073b93db7ed9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-02 16:39:03 +00:00
Orgad Shaneh
0e8a0cac47 C++: Parse __alignof__
Change-Id: I093c2a786cf8f10de4f05c23f3763ef1300feabd
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-02 14:55:00 +00:00
Eike Ziller
f8596d6c63 iostool: add missing overrides
Change-Id: I80e072c5bde4874b89a0af2e105e378674e8d9fe
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-02 14:42:38 +00:00
Christian Strømme
7dd847404f Android: Get Java home location from the java_home tool on OS X.
If the java_home executable exists on OS X we can run it to get the
current JDK location.

Change-Id: I5d032d153cba4d7168931ab0f83723292d3d714a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-02 14:10:04 +00:00
Christian Kandeler
e548635a24 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I53e4f472e04e87520fb5be0c64030090e64e8a6b
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
v3.5.1
2015-10-02 13:55:32 +00:00
Tobias Hunger
5bc0d37479 QmlDesigner: Remove dead code
Change-Id: Ic52cb1cc87f5903f5969b40588af7783b05f0f6f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2015-10-01 16:32:52 +00:00
Eike Ziller
bbc07bd47e iOS: Do not hardcode Qt version in iOS kits
Since Qt installers nowadays (since Qt 5.3) register all Qt patch
releases of the same minor version with the same ID, the Kit will not be
updated (because the Qt 'is the same'), so it should use %{Qt:Version}
instead of hardcoding the version.

Change-Id: Ieb8b766490b3c6297fa11802c6e13724658795d5
Task-number: QTCREATORBUG-15128
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-01 16:31:22 +00:00
Ulf Hermann
8db0a1b671 Remove QtQuick1 debugging option from build & run settings
We don't need to support QtQuick1 anymore. Consequently, the
minimum Qt version for QML debugging is bumped to 5.0.0.

Change-Id: I9528de3f6869fb391eaf9560a148e03f6067b9de
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-01 13:54:57 +00:00
Ulf Hermann
b83ac9cc62 Remove functions to build QML debugging helpers
They aren't used anywhere.

Change-Id: Ia2b72e4cc60cfb7a6d360d7fb6ba7445dfe64d13
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-01 13:54:42 +00:00
Nikolai Kosjar
a5674be613 Clang: Unregister file with project immediately on project close
Ensure that first the editors unregister with the removed project part,
then unregister the project part.

This makes testing and following the message logs easier.

It also fixes the following race condition:
 * Unload project of opened file
 * Immediately close the editor before a new project part is calculated
 ==> The editor is closed, but the translation unit is not properly
     unregistered.

Change-Id: I618930d221323435ba60ac6c051380bccc9fdaf1
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-01 13:44:48 +00:00
Marco Bubke
27991f2c8f Clang: Add -Wno-shadow
Change-Id: Icc6b08a0eea026d3126c236a37318eaee9f3c0e8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:21:58 +00:00
Marco Bubke
bdd82b7a4c Clang: Add -Wno-documentation
Change-Id: Ie0e4babe29934d9b90d24bb4c966d6ed6ba3c238
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:21:52 +00:00
Tobias Hunger
ec5fd1a711 ModelEditor: Fix warnings about missing overrides
Change-Id: I9f89ab863c6f6535b8f81d129d547dfa5a54a90b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-01 13:07:42 +00:00
Marco Bubke
893e2279b3 Clang: Add -Wno-gnu-zero-variadic-macro-arguments
It's actually tricky because the standard says that zero arguments should
be not possible in variadic macros but certain compilers support it and we
using it in the logging framework.

Change-Id: Ib9e1832748e8c57f149dfcfefead9618fd5e51f4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:07:22 +00:00
Marco Bubke
f31e02be3c Clang: Add -Wno-global-constructors
Change-Id: I77f89e15142ae5e0b6484bc02aef7b9733ea8c1f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:07:17 +00:00
Marco Bubke
ecce6cd12f Clang: Add -Wno-exit-time-destructors
Change-Id: Ibf6b5c9a791e0fad49939c2a352b7eaa064f2376
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:07:12 +00:00
Marco Bubke
54f505b834 Clang: Disable warning newline-eof
Change-Id: I9a773d70485f3e534e7fabdde3bd5936002c851c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:07:07 +00:00
Marco Bubke
d6d5d9ac8c Clang: Improve IpcCommunicator::requestDiagnostics
Add logging and don't send if sendMode is IgnoreSendRequests.

Change-Id: Ia3df9fd2c1c75cfec720233518401fc9df5e0017
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:05:13 +00:00
Marco Bubke
a4917d3fdd Clang: Disable logging by default in unit tests
Change-Id: I489cec1dcbcfba71dfa6679e8d90bbf8c8d0a867
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-01 13:04:59 +00:00
Nikolai Kosjar
210228da1f Clang: Whitespace fixes in translationunit{s}.cpp
Change-Id: I6e9f479023f0993df365b4e2f0d71539e962c278
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-01 12:59:05 +00:00
Nikolai Kosjar
f1300df6b3 Strip BOM from files
Change-Id: I9167c016760fe1e8378cdf84144c4bed5cd4e57c
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-01 10:51:10 +00:00
Robert Loehning
f3400f62cd Squish: Remove workaround for fixed bug
Change-Id: Ifac94dfc27b0cb5f230d7b137bafabaa82a6773c
Task-number: QTCREATORBUG-14307
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-01 08:59:08 +00:00
Oliver Wolff
1dc89f8814 Fixed compilation using Qt 5.5 on Windows
Change-Id: I5f40a9a8cb2db3e87e70d33783e6de9d085d7368
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-01 07:16:36 +00:00
Jochen Becher
0954b38697 ModelEditor: Add new button to open parent diagram
If the currently open diagram has a parent diagram (that is: a diagram
in the package one hierarchy step up) it can now be opened by pressing a
button in the toolbar. Default short cut is Ctrl+Shift+P.

This change completes the navigation features.

Change-Id: Ie073676644a6283842b2bbb0d14aca1dfe2706e7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-30 18:54:13 +00:00
Jochen Becher
c39242c166 ModelEditor: Support editor's navigation history
For now only the id of the currently opened diagram is stored in the
navigation state. The position of scrollers is not saved.

Change-Id: Ic9b2237a0223596d1111c635f04f11e3951fd397
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-09-30 18:53:22 +00:00