Commit Graph

44349 Commits

Author SHA1 Message Date
Orgad Shaneh
4b8564cb42 ProjectExplorer: Replace macro usages with HostOsInfo
Change-Id: I8d4975635f0a4a181ff1ea0950bb58819aae1546
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-12 07:33:54 +00:00
Nikolai Kosjar
920ff1062d Clang: Renaming fixes
Change-Id: Ied593e31acdcb234e7376858404fb82e45fad2c1
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-12 07:26:51 +00:00
Nikolai Kosjar
11363fafd5 Clang: Remove unused member
Change-Id: Ife0a07daf7f47a1af31660bdbbf00595a4a791f2
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-12 07:26:47 +00:00
David Schulz
f1ee907bf4 Highlighter: Handle lineEmptyContext in generic highlighter
Task-number: QTCREATORBUG-16304
Change-Id: I8202bcb9cbebac5913d49e39011eb00f909aa4ad
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-12 07:22:37 +00:00
Eike Ziller
b554829fd8 Core: Fix that core settings like shortcuts were only saved at shutdown
Save them also whenever a settings save is requested, which e.g. also
happens when closing the options dialog.

Change-Id: Ic20f1007381a4d0a8157f17fd24c0d8ea24907ee
Task-number: QTCREATORBUG-16576
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-12 07:10:12 +00:00
Ulf Hermann
0d5f5bdd6c QmlProfiler: Keep Compile and QML/JS statistics separate
The QML compiler can run asynchronously and produce ranges that don't
match up with other QML/JS ranges. The statistics model assumes that
all ranges are perfectly nested, and produces incorrect data if they
aren't. The compile ranges are perfectly nested among themselves, and
the other QML/JS ranges are also perfectly nested among themselves, so
we can fix this by keeping separate statistics for them.

Also, choose a less insane data structure for the relatives model.

Change-Id: I146593b67586e7b5aba6b19d360961c142511289
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
2016-09-09 08:21:20 +00:00
Christian Stenger
add34759fa AutoTest: Add some (debugging-related) options
Task-number: QTCREATORBUG-16694
Change-Id: Ie2c32c7e8fd73ba351d65a510af0d4d3574c9691
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-09 05:35:23 +00:00
Lorenz Haas
bf8a1c07b1 Beautifier: Accept C and Objective-C files by default
Task-number: QTCREATORBUG-16806
Change-Id: I2f553fc82e9f0a192caaf4594227da3bb643b118
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-08 13:50:46 +00:00
Ulf Hermann
879b770277 QmlProfiler: Don't switch to edit mode if editor is invisible
Clicking on something in the QML profiler should never trigger a switch
to a different mode.

Change-Id: I4784e836b0091d44fd046b605c49d2b10b3e8c34
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@theqtcompany.com>
2016-09-08 10:51:08 +00:00
Robert Loehning
04003d81b0 AutoTest: Improve string for translation
Change-Id: I2cb2ed0ade1a7bfa3b07855b8114aa1fd1de2d62
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-08 10:44:32 +00:00
Christian Stenger
f3cb2ee761 AutoTest: Provide DebuggableTestConfiguration
Preparation for easier distinguishing arguments for performing
normal run versus debug run.

Change-Id: I41cfa7fca5730f721b5b6a980c82c015f9e7f914
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-08 05:58:25 +00:00
Nikolai Kosjar
985e4436f2 Clang: Rename TranslationUnitCore to TranslationUnit
Change-Id: I03a59ae5d5073c812ad40c7623cfb1fdb80aad80
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-07 13:36:43 +00:00
Nikolai Kosjar
14b27183ce Clang: Rename TranslationUnit(s) to Document(s)
The "TranslationUnit parts" moved already to TranslationUnitCore.

Change-Id: I2bea7847e2b3e84fbfacc3d2dc43f180873349ac
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-07 12:36:19 +00:00
Ulf Hermann
6a2e11940f QmlProfiler: Start connection timer before connection
The QmlDebugConnection might immediately signal a connection failure
on connectToHost() or startLocalServer(). If the timer is not running
then, we trigger the QTC_ASSERT in qmlDebugConnectionFailed(), which is
meant to make sure that we don't silently give up. In this case, we
haven't even given up, yet, as the timer is in fact started afterwards.

Change-Id: Ia2c107d9b511092eaf32380203a3b4628139d320
Reviewed-by: hjk <hjk@qt.io>
2016-09-07 08:26:39 +00:00
Orgad Shaneh
34baa3ec47 CppEditor: Add enclosing template on "Move Definition Outside"
The template id for the class name is missing, but it's better than
nothing.

For example:

template<class T>
class Foo
{
    void func() {} // Move Definition Outside Class
};

// The following lines are added
template<class T>
void Foo::func() {} // Should be Foo<T>::func

Task-number: QTCREATORBUG-16649
Change-Id: Icb560e0b87f563cbda18f4742f44bb8ef4d8a900
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 13:23:18 +00:00
Orgad Shaneh
d0d1f43e8f CppEditor: Add enclosing template on "Add Definition"
The template id for the class name is missing, but it's better than
nothing.

For example:

template<class T>
class Foo
{
  void func(); // Add Definition
};

// The following lines are added
template<class T>
void Foo::func() // Should be Foo<T>::func
{
}

Change-Id: I60a0cbd348985def3dfb7037067786e942278593
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 13:23:12 +00:00
Versus Void
5cd77137bc CppTools: Fix loading of .config files
.config file wasn't considered during creation of injected configuration
file thus disabling code processing inside #ifdef blocks.

Task-number: QTCREATORBUG-16236
Change-Id: I50f21622ec1b246aaa80e4832fd826f1b61d8e96
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 13:14:37 +00:00
Orgad Shaneh
39aff55d8a C++: Enable showEnclosingTemplate also for function type
Do not require directly passing the enclosing template.

Change-Id: Ie03bc58338fe003677a5f5311d86d70f499373ee
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 09:33:48 +00:00
David Schulz
50a6c47830 Use icons and default tool tips in text mark popup
Change-Id: I4487d642e066479e8e344ed77e539de92fbca651
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-06 09:12:36 +00:00
Christian Kandeler
76e85ab77a RemoteLinux: Try SIGTERM first when terminating processes
This was done for the "kill by process name" operation, but not for the
"kill by PID" one.

Change-Id: Ia8eb57d1fa030624470489dbd0e7b03093fd822b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-09-06 08:46:36 +00:00
Eike Ziller
0e542a6a29 Fix build
Change-Id: Ie23ae9e462dff66206759bacda13876dce8264a0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-06 08:18:11 +00:00
David Schulz
9ce19c5dac Cdb: Fix QList child dumper
Task-number: QTCREATORBUG-16750
Change-Id: If67e2a55bb0a67957b10069675cdd0df7a18ad10
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-06 07:45:33 +00:00
David Schulz
5908d9aa14 Cdb: Fix sorting of reference node children
Task-number: QTCREATORBUG-16813
Change-Id: I640deb73c54a6f59ee5ff61e37ab487a05b05f27
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-06 07:32:27 +00:00
Christian Stenger
01f222bfdc ExtensionSystem: Fix compile on OSX
Using Qt5.6 and Xcode 5 or Xcode 6 results in compile
issues.

Change-Id: I33af400f51991e043672712b531869c6a79d6ffd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-06 06:06:44 +00:00
Marco Bubke
eac89b9a5f Clang: Remove unused library
Change-Id: Ia5031feee2be57bf5a0ac9d3f21e6010e5136afa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-05 15:01:16 +00:00
Thomas Hartmann
94fdf981bc QmlDesigner: Support for Qt Quick 2.8
Change-Id: I40c085538872df30224219d2b693d6868242fad1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-05 14:42:12 +00:00
Tim Jenssen
cf6c4c71a4 Sessions: call method at the model
Change-Id: Id10f0910e2408a579f6bb92719c93967afcc9bd9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-05 13:06:13 +00:00
Eike Ziller
f38531effb Add a menu entry for copying system information
Which outputs the information from qtdiag, installed plugins,
and general Qt Creator build information.

Task-number: QTCREATORBUG-16135
Change-Id: I618b9883369bae45006bb109f8757e89b091b882
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-05 13:00:54 +00:00
Thomas Hartmann
ca63002093 QmlDesigner: Expose auto completion to property editor
Change-Id: If569e3f22e2ee934b9043b2e139da597686497ff
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-05 12:53:04 +00:00
Thomas Hartmann
b12338b06d QmlDesigner: Add interface for code completion to QmlDesigner
Change-Id: If569e3f22e2ee934b9043b2e139da597686497aa
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-09-05 12:52:54 +00:00
Christian Stenger
053f5bf3d3 AutoTest: Show results for debugging tests as well
At least display results for using gdb or lldb and inform
user that we are not able to do so when using cdb.

Task-number: QTCREATORBUG-16693
Change-Id: I1a98a79aaf76de47b5dcb58d4dca9247f1642d36
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 12:40:59 +00:00
Thomas Hartmann
e0e314427d QmlJSEditor: Expose helper function for auto completion
The function qmlJSAutoComplete() will be used by the QmlDesigner.

Change-Id: If569e3f22e2dd934b9043b2e139da597686496ae
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-09-05 12:21:45 +00:00
Marco Bubke
2e062552eb Clang: Report an error if the unit test are linked with LLVM without RTTI
We don't want to disable RTTI in unittest so we require to compile them
with RTTI. You can disable yourself RTTI if you don't want them for some
reasons.

Change-Id: I76d05a36442305f379ce3d88b3f6ed4372127002
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-09-05 10:01:14 +00:00
Christian Kandeler
e41eff5567 Fix qbs build on macOS
The linker does not understand the -fobjc-link-runtime option. Use the
cpp.driverFlags property as a workaround. Technically, it should use a
property that is only applicable when the toolchain driver acts as the
linker, but we don't have it (yet).

Change-Id: I0707e08726f54a329feb440f2d8a984c12de9f4f
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-09-05 09:17:16 +00:00
Eike Ziller
02f8572f8a SessionModel: Fix compilation issue with no-so-recent Clang
Which seems to have issue to construct a std::function<void(T)> from a
function pointer to a function that does not return void.

Change-Id: I10d79f328acb922dac298ec598eecff1d3b9f522
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 08:12:44 +00:00
BogDan Vatra
258dc5d2e4 Fix debug on Android 6+ with NDK r11+
Task-number: QTCREATORBUG-16721
Change-Id: Ic65f13076794b75d6e4551b68d26fd3752f82098
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:07:37 +00:00
BogDan Vatra
84b7e199ac Android: Fix package name search
Android 7.0 ps doesn't add \r anymore to the EOL.

Task-number: QTCREATORBUG-16782
Change-Id: Iff596ac2c1eafd0c5422cbac5708c8b616c73ecf
Reviewed-by: hjk <hjk@qt.io>
2016-09-05 08:05:23 +00:00
Robert Loehning
b03c92a6ff AutoTest: Remove stray white space
Change-Id: Ic50dfc5549974641df08666152ed1a3b70d9b580
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-05 05:32:50 +00:00
David Schulz
830a7c51dc Editor: Remove senseless assert
As this slot is triggered by a queued connection the document
can change between emitting the signal and the assert.

Task-number: QTCREATORBUG-16221
Change-Id: I29cb6cd8546e38863318393e2cc39fa791cf20d6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-09-02 10:46:25 +00:00
Tim Jenssen
a53607a427 Sessions: prepare SessionModel for reuse
refactoring redundant code without a behavior change

Change-Id: I264ee28ebf9b2d01899ece3f01c424032bda56ca
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-01 14:47:42 +00:00
Tim Jenssen
dea29d5ed4 MSVC: don't set c++11 at all MSVC versions
This resulted in wrong cxx flags for the clangbackend, which couldn't
compile algorithm include file for example then.

Change-Id: Ida7bebf2435e1bc031b62204d169cf008a189f25
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-01 12:18:21 +00:00
Eike Ziller
1fe874e65e Todo: Avoid issues with screwing up or screwed settings
If for some reason the todo settings are borked, do not crash/assert.
Also, avoid overwriting existing settings with default settings, if
for some reason the todo plugin is never initialized (because a
dependency fails to load).

Change-Id: Id7815b799adaff3dcdf00fedb9ade3ced01e23b9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-09-01 11:25:47 +00:00
Andre Hartmann
a249f89020 Locator: Support moving to the first or last proposal
For macOS with keys Home and End, for the others with
Ctrl+Home and Ctrl+End.

Change-Id: I73cde89b57bc3cce89c6638d2692bcafbd4710af
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-01 11:11:51 +00:00
Eike Ziller
52fc5904e0 Fix that welcome mode was no longer shown at startup
Even though the tab was selected. Broke with
e440e344ca and
abcdadd40e .
We need to update the current index when tabs/modes are inserted before
it.

Change-Id: I26b5252d365c0108584534bcb0ee1aacc3eacce3
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-09-01 10:16:37 +00:00
Thomas Hartmann
1df58005b5 Adding logging rule qtc.*.info=false to disable output by default
I also added the qtc prefix to all logging categories.

Task-number: QTCREATORBUG-16767
Change-Id: I04214dba9912fe6c669f10566582d6009b5d75f0
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-09-01 07:59:48 +00:00
Thomas Hartmann
99411324af QmlDesigner: Do not remove puppet stream if puppet crashes
Change-Id: I0374fbd9007cd8965b886e5f0a872434046e2bcd
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
2016-09-01 07:59:28 +00:00
Alessandro Portale
4c197a6cca Cdb: qdoc data "\class" -> "\struct"
Change-Id: I8f8599704c71413055257fd5a54bd6efb17bc61c
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-09-01 07:58:44 +00:00
Eike Ziller
e0281fcc84 Fix merge issue
Change-Id: I328720587d8a973fabcbd9c66a70185ba29cbbca
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-08-31 13:18:40 +00:00
Eike Ziller
c56aa52b80 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
2016-08-31 14:40:38 +02:00
David Schulz
a4bf137a9f Cdb: Make extension parameters accessible again
Change-Id: I0796f7ac3cbb5c7af77b2db51bd75c9671b1a770
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-08-31 10:17:15 +00:00