Commit Graph

57165 Commits

Author SHA1 Message Date
David Schulz
a073c267da WinRT: set symbol file before debugging winrt packages
Change-Id: Ic3224cd1f12e799a9b38f31ba6dfe04c7774e35f
Reviewed-by: hjk <hjk@qt.io>
2018-07-10 09:14:25 +00:00
Tobias Hunger
abc177efbc CMake: Use SettingsAccessor to read/write CMakeTools file
Change-Id: Idcb0d97c8ef4037ea97d8498f935f8631ca30bc5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-10 09:00:14 +00:00
Tobias Hunger
58ebcbe0ec CMake: Use unique_ptr to store CMakeTools in CMakeToolManager
Change-Id: I4dfb76b40e22da745b80c359d544fa2b6d3dac52
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-10 09:00:06 +00:00
Tobias Hunger
3548bf7773 ProjectExplorer: Store kits on load in expected order
Store the kits on load in the order expected when trying to pick a
default kit and get rid of the code that garanteed that via two
temporary lists.

Change-Id: Ib823263c6070d0524885e5bb7f168cc479d98e0b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-10 08:35:16 +00:00
Friedemann Kleint
955105b790 ProjectExplorer: Fix handling of the QTC_USER_FILE_PATH variable
Add a quick check whether the variable is set and return nullopt
in that case. Flip the check in the below code.

Change-Id: I655662f2940946150165107a66c003a3a4bc025d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-10 08:13:11 +00:00
Eike Ziller
edcb8efb8b Fix running lrelease and lupdate as external tools
With newer Qt versions. These want to run cl.exe on Windows, which
usually is not on the PATH except for the build environment.
So, use the current build environment's PATH if that is available
(falling back to the system environment's PATH).

Task-number: QTCREATORBUG-19892
Change-Id: Ia512b3599d2cca7a0d1169b0d673f32158cb701f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-10 07:55:40 +00:00
Eike Ziller
91030f807a Add %{CurrentBuild:Env} to global environment
%{CurrentBuild:Name} and %{CurrentBuild:Type} are there too.

Change-Id: I06b49da61cd689b54be87333d7fa3f212ebf1762
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-10 07:55:30 +00:00
Eike Ziller
c2bba5bbd4 Expand variables in external tool environment
Change-Id: I98fc942f25309bba1b4573b0544418d3b4b836c8
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-10 07:55:23 +00:00
Eike Ziller
4c144b45ab Show 4 columns of examples within Qt Creator's default window width
By reducing the width of the individual items.
Otherwise first startup looks a bit stupid with a large empty column to
the right.

Change-Id: Iff7fa343a5c36181f09e1e3c18307dc55bd11abc
Reviewed-by: hjk <hjk@qt.io>
2018-07-10 07:53:11 +00:00
Eike Ziller
d09b71d260 Merge remote-tracking branch 'origin/4.7'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I01c4880850ad25432a65bb32849365d2aeb0756f
2018-07-10 07:44:53 +02:00
Vikas Pachdha
ed30522bb8 Android: Fix aapt tool's path in windows
Task-number: QTCREATORBUG-20750
Change-Id: Ie35675d789007a6c79b979b4520dc0ecc83c688c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-10 05:29:49 +00:00
Christian Stenger
3300182d40 Wizards: Make it easier to debug cmake based quick applications
Change-Id: I09a09fb14b3cf8d5486e84413f9f3238c72e2d0f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-09 15:27:11 +00:00
Ulf Hermann
8eef50e576 Qml Debugger: Disallow editing of items with children
The debugger will treat any value you put in there as string, and then
fail to update the item because it doesn't expect the type to change.
Proper editing of JavaScript objects requires quite a bit more UI than
this, so disallow it for now.

Task-number: QTCREATORBUG-20736
Change-Id: I7bf6e7a3747cde3c6682b66aaa810291f753e85d
Reviewed-by: hjk <hjk@qt.io>
2018-07-09 13:44:36 +00:00
Ulf Hermann
126030d079 QML Debugger: Make sure to re-fetch expanded properties on update
If an expanded object is updated we typically just get the ref for it.
If we leave the tree item at "wantsChildren", the debugger will think
that the update fails and "adjust" the "child expectation" to none.
Fetching the children right away takes care of this.

Task-number: QTCREATORBUG-20736
Change-Id: I1b3725e7106a563198962915cbcab8f68ef741a6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-09 12:31:51 +00:00
Eike Ziller
7442790934 Show examples page in welcome mode on first start
This change might help first-time users getting started.

Task-number: QTCREATORBUG-20674
Change-Id: If55402160bf6b1515142bb64f281654fe4c68134
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-07-09 10:26:02 +00:00
Robert Loehning
3bf887c2ad Squish: Update tst_CSUP01
The built-in code model also proposes "void_t".

Change-Id: I2462e47d5b1a69065f998244fc8372011e37a0c8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-09 09:53:55 +00:00
Robert Loehning
6a42d8bd74 Squish: Give code model more time to list refactorings
Change-Id: I944dfa306954cd16fdb24334db6e869702da282f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-09 09:53:44 +00:00
Robert Loehning
b85692e920 Remove wrong quotes from German translation
%1 contains line breaks and bullets. Having quotes around it is pointless.

Change-Id: Iced4bd6efcf60b1005fcd560ea773e208a0df997
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-09 09:53:33 +00:00
Eike Ziller
e152b1c468 Fix crash when filtering out warnings from issues pane
Do not send endRemoveRows if we never sent beginRemoveRows.
Fix up of 702d6a6914

Task-number: QTCREATORBUG-20741
Change-Id: If22a18e6426c8b4041924a170d5927ab9d11ccdf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-09 09:33:52 +00:00
Orgad Shaneh
943f499fe4 Git: Silence managesFile
When adding existing untracked files to a project, and choosing to add them
to Git, error messages appeared in the output pane.

Change-Id: Iba639a678d2ca424fb32b34b218fca1c4b99971d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-09 09:33:20 +00:00
Ivan Donchevskii
534aa02163 Clang: For definitions show their parent class qualification
Append methods and class members with the scope they belong to
extracting the parent name. It was like that in old code model.

Example:
namespace Foo {
void Bar::function() {}
}

Old result:
Foo
  function() -> void

New result:
Foo
  Bar::function() -> void

Change-Id: I9dad86a6738baafb1a210c5e1146d8de33828c44
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-09 09:24:35 +00:00
Ivan Donchevskii
91cbbd39ac Clang: Don't show template type parameters in Class View and Current Document filter
They do not bring any value.

Task-number: QTCREATORBUG-20716
Change-Id: I2876f0e1e3918cb33d133b4a65ccaefd9bd30ac8
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-09 09:24:19 +00:00
Vikas Pachdha
42754374b0 Android: Parse APK to find package name and other information
Task-number: QDS-16
Change-Id: I228af0711fb2dd64ff96dcb5fc9bc634b556ffd9
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-09 08:57:49 +00:00
Vikas Pachdha
f19a6e8ac2 Android: Add API's to run Android SDK tools
Task-number: QDS-16
Change-Id: Ifea5aa17330833cd130555778134fb8f90e2d990
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-09 08:16:22 +00:00
Eike Ziller
299da01332 QmlDesigner: Fix crash when opening qmlproject while Design mode is open
Fix the order of signal handling, which was changed in
a5935cb27a
but leads to this crash.
The connection to the DesignMode instance still needs to be
delayed to after it has been created in Core plugin's
extensionsInitialized, so do the final initialization as a reaction to
ICore::coreAboutToOpen.

Task-number: QTCREATORBUG-20495
Change-Id: I92d9a4ff689d2f191d2fd368966ca582bf8af2f7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-07-06 14:01:40 +00:00
Eike Ziller
d20464d56f Add change log for 4.8
Change-Id: I5e6d509cd3c8b421d95d9cac9cfc32282a583789
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-06 13:54:00 +00:00
hjk
cb572773c0 Debugger: Robustify MainWindow state saving
Save the state before child widgets are affected.

Task-number: QTCREATORBUG-20721
Change-Id: I1d0d1ca610b0a8e8904585953ecbb42dddee4827
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-06 13:42:05 +00:00
Eike Ziller
887cdfa7e9 More changelog for 4.7
Change-Id: Iec38a288aba9971b1d779a1bc4ff2eee31f46030
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-07-06 11:33:36 +00:00
Eike Ziller
21ac38aca9 Version bump to 4.7.0
Change-Id: I339097aa2a0deeeea4bd81a9a8b74c6732bb217d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-06 10:30:50 +00:00
Christian Stenger
a7fba990f4 Debugger: Fix Qt namespace detection for gdb8
Task-number: QTCREATORBUG-19620
Change-Id: Ieb7a8bc8cfeb8ba4331436ef6652437c0971c356
Reviewed-by: hjk <hjk@qt.io>
2018-07-06 10:10:05 +00:00
Christian Kandeler
b620727bb8 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: I06fb4bfcf1b7affd6cb1ca6fbf0c39e886e4d27c
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-07-06 09:51:53 +00:00
David Schulz
ef952d6caa Debugger: modernize cdbengine
Change-Id: Ifac1bceb2d5d485269a44c4e3e6def403e6d7b20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-06 09:10:31 +00:00
Leena Miettinen
2cf84b8411 Doc: Pull information about C++ sidebar views into separate file
To make docs more modular.

Change-Id: I58095b2b4e9e216808cc4d37b3494480cbf1787c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-07-06 08:19:26 +00:00
Vikas Pachdha
d9bcf78270 Android: Use ipv4 host to connect to app in android
IPv6 enabled systems can have IPv4 and an IPv6 entry for localhost
and macos seems to prefer IPv6 for localhost and IPv6 is not
supported by adbd

Task-number: QTCREATORBUG-20730
Change-Id: Ia0823fa04581afc6297e5e8d57a8034ba1b5749c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-06 06:07:22 +00:00
Tobias Hunger
b59ecaacb0 ProjectExplorer: Remove KitManager::deregisterKitInformation
It is unused and can not really be used in a safe way, so let's
just remove it.

Change-Id: I7926d1781f8f61d00fc3c516b8d1e2a01164a85a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-05 13:02:00 +00:00
Tobias Hunger
2039a7dd69 KitManager: Update formatting
Change-Id: Ie7da94574a1577bafae3adbe3a0d777d863e6658
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-07-05 13:01:50 +00:00
Tobias Hunger
0ac5e9c30e SynchronousProcess: Make runBlocking more robust
Make runBlocking handle the case where the process starts up too fast
for waitForStarted.

Change-Id: Id8f3522c7c23bc8d7cdbbc94da6fa6c0b8e45454
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-05 13:01:00 +00:00
Ivan Donchevskii
ad11e08f72 ProjectExplorer: Search for clang-cl compiler in path
Currently we only check if it's in the registry which
is not the case when you have a custom build.

Change-Id: I20ec25378d16996f790726ed14238861bc220004
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-07-05 11:49:15 +00:00
Eike Ziller
5c81a65422 Merge remote-tracking branch 'origin/4.7'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I29916313f12e25f3942ac926f8e4d4490074978e
2018-07-05 11:14:33 +02:00
Eike Ziller
9bbb085718 QMake parsing: Improve behavior in case of empty build directory
The build directory can be "empty" if there is no build configuration,
or if the build configuration's build directory is empty.

Handle both cases in the same way.
This avoids passing an actually empty build directory to the parser,
which the parser does no longer handles gracefully on Windows.

If the build directory is empty, use the project's source path (instead
of QDir(QString()) which is the current working directory), which makes
it consistent with the behavior when actually building in that case.
The parser does not actually write files to disk, so there is no issue
with temporarily using that directory and later switching to a shadow
build directory.

Task-number: QTCREATORBUG-20121
Change-Id: Ia454085edae6b55b445cc5cf0ec3ae1c85464b0c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
v4.7.0-rc1
2018-07-04 15:17:04 +00:00
Lorenz Haas
2ba326cd04 Beautifier: Long live uncrustify
By accident uncrustify's option page got kicked during a refactoring. This amends 9a7e7f7d4.

Change-Id: I27aba7bcf689b20763446fd445f4855050669865
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-07-04 09:41:00 +00:00
Eike Ziller
2e1f0c2578 Fix documentation build when renaming IDE
Do not rename documentation qhp file. The documentation qmake files
currently depend on the files having the same base name as the qdocconf file.
Also do not change the documentation namespace. There are places where
these are mentioned in translated strings.

Fixup of 54208113ee

Change-Id: Iace171535ea5be6e22fec9760a5d96722b052341
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-04 07:42:14 +00:00
Thomas Hartmann
efccf11835 QmlDesigner: Reparent only on CTRL+SHIFT
Shift is a common modifier and we should use it
to limit changes to one axis (e.g. x), since this
is a useful and typical usage.

We moved reparenting to CTRL+SHIFT. It has issues
and can trigger crashes. Still it can useful
and it is unlikely to be triggered randomly/by accident
on this shortcut.

Task-number: QDS-7
Change-Id: Ieeac6323659d5bd95bd27a05b8e18808ecdf390b
Reviewed-by: Brook Cronin <brook.cronin@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-04 07:21:55 +00:00
Vikas Pachdha
aa4407e332 Android: add logging for build and run
Change-Id: Idca5a45713762aa9e2861dcc58c3bbd96cbe687e
Reviewed-by: hjk <hjk@qt.io>
2018-07-04 07:04:03 +00:00
Kai Koehne
c633f3eec8 qmljs: Add autocompletion for QtWebEngine imports
Task-number: QTCREATORBUG-20723
Change-Id: Id7e6700e87b73c845a0dda6152731085eaf5fcf1
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-07-04 06:34:32 +00:00
Christian Stenger
63034e55ce Debugger: Fix state of instruction wise operation button
Task-number: QTCREATORBUG-20714
Change-Id: Ie45fcb288a5e6a566a38b35d375b703c9c5a2326
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-07-04 05:52:46 +00:00
Leena Miettinen
7201b26a52 Doc: Pull out "Adding States" into a separate topic
To further modularize the Manual.

Change-Id: I9b51ce951b92ff6690780de3d9f08f436169150d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-07-03 12:54:25 +00:00
Leena Miettinen
69108b614a Doc: Add information about connections
Divide the subtopics into individual topics.

Change-Id: If32ada04e9f305cf9a2e3a03072026eac92d005a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-07-03 10:01:47 +00:00
Thomas Hartmann
aeb192a814 QmlDesigner: Stabilize property order of meta data
This reduces noise in the source control system.

Task-number: QTCREATORBUG-20686
Change-Id: Icf7d0d5b1af288f3518594233086917f039a47a0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-07-03 09:55:02 +00:00
Robert Loehning
417a6db087 Tests: Add lines for testing editing and output of int
Change-Id: If31b5957fa55f5dd31205a0b4495491314fa87c0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-07-03 09:22:08 +00:00