Commit Graph

44349 Commits

Author SHA1 Message Date
hjk
d87afd4b89 Debugger: Make DebuggerRunTool publicly accessible
That's a temporary move to be able to port the per-target
Debug*Support classes one by one.

Change-Id: I3cf5f9ea367a68058add8713ed23f44da080a175
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-21 09:06:08 +00:00
hjk
dfb825e2a7 Debugger: Fix running on RemoteLinux
This (temporarily) works around the start up regression due
to wrong order of merged patches.

Change-Id: I7a386fb06175363aa23862716687764b930c52d8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-21 08:08:37 +00:00
Montel Laurent
86ea365a0b Use const'ref in theses methods
Change-Id: Idfa5ffdcf23d1ef80442276690b8082b8279dbfa
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-21 07:58:39 +00:00
Orgad Shaneh
c60103fc66 ProjectExplorer: Fix link on linux
Amends 2ff642d8e4.

Change-Id: Ic13306e23871b519ab0c4a1b4f528c97312fb1d5
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-04-20 19:45:23 +00:00
hjk
d049a5be19 Debugger: Base magic Qml connection discover on base run control signal
Less debugger specific code and less convoluted paths in debugger
message handling.

Change-Id: Ib298889c386d65f17acbdfc585188097bb20ed74
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-20 14:57:57 +00:00
Tobias Hunger
0dfd08b00e AbstractProcessStep: WS only change
Change-Id: I0b218298aeae9730b74c66e6bf7b2c96048a8b93
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-20 14:02:42 +00:00
Tim Jenssen
e21843e309 QmlDesigner: set splitter handle zero again
Was broken since 6f1d23711d which sets
css only at widgets where it is necessary.

Change-Id: Ia60672136ad8c73791806c920051918dbb23748c
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-20 13:39:04 +00:00
Eike Ziller
5b3ed3f9cb Remove unused "suppressed" property from navigation widget
Change-Id: I7e94b258991b9211156c75a4475b468b585b00f5
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-20 12:34:15 +00:00
Thomas Hartmann
3d8f131d67 QmlDesigner: Crash fix
This is a nasty one. The text item that
triggers the crash is part of a delegate and therefore,
does not have an item in the scene.
The rewriter is now setting the id again, when reading the file after
the Rectangle is removed. we get a crash.
Since delegates are currently not shown in the navigator, this crash
could not happen before we introduced the integrated text editor.


Task-number: QTCREATORBUG-17970
Change-Id: Ica16dec5bb2f852324de179c4a2b4d43dcf27aa9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:53:13 +00:00
Tobias Hunger
1050c8605c Environment: Use range-based for loop
Change-Id: I80bd9c5fee00e8df47735e4c71694d7ac279e3b1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:45:54 +00:00
Tobias Hunger
d8533815de Environment: Simplify code a bit
Move duplication check into class and do not duplicate that.

Change-Id: I6fa34fb2e39d47432e87e959d1e5f44d21287bad
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:45:47 +00:00
Tobias Hunger
258faf3e96 Environment: Use std::function
Change-Id: Ifb2d3aa1459863d69a1e171eb5ff7d3b44b16377
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:45:42 +00:00
Tobias Hunger
d1344588ac Environment: Simplify code
Change-Id: I385cfcbd585a615f4d42b24fd359db876dcf8147
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:45:36 +00:00
Tobias Hunger
e0d0c15f36 Environment: De-noise
Change-Id: I26e10daf8427367b598b3bc3d95a4715ced1bbb0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-20 09:45:31 +00:00
Thomas Hartmann
e2be021cba Fix dead store
Change-Id: Ia7547803a379cd0518fdf3d707717f1bc9976dd1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-20 08:01:12 +00:00
David Schulz
7fa9316a96 Debugger: Disable break on warning/fatal for cdb
This seems to cause more trouble than benefit. Additionally this option
is on the _gdb_ extended settings site.

Task-number: QTCREATORBUG-17902
Change-Id: Ie548f68f84bffee670559b48f6a2ba259f8b8757
Reviewed-by: hjk <hjk@qt.io>
2017-04-20 08:00:21 +00:00
David Schulz
1397d1750c Debugger: Fix assigning std::string
Task-number: QTCREATORBUG-17267
Change-Id: If195fe801964a809363b68f09aa6ac8e1ba6e686
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-20 07:41:45 +00:00
Thomas Hartmann
cbf8e0b2d6 Fix Shortcut for right sidebar
Ctrl+0 was confliciting with "Reset Font Size".

Task-number: QTCREATORBUG-17857
Change-Id: I280c65446fd1f8ce3af66b06760ed7b9b210e8c3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-19 14:51:36 +00:00
Nikolai Kosjar
2ed089ba7f Clang: Fix path to intrinsics dir
...which got lost in

    commit 1e3f2eec8d
    Clang: Consolidate all ClangCompilerOptionsBuilder into one implementation

This will fix

    SOFT ASSERT: "!resourceDir.isEmpty()" in file
        C:\work\build\qt-creator\src\plugins\cpptools\clangcompileroptionsbuilder.cpp,
        line 119

Change-Id: Ie0301517eca580b4907bbcd8f524775f2b0bedb8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-19 13:23:55 +00:00
Thomas Hartmann
8f828fc9a2 QmlDesigner: Add assert
Change-Id: Ic7cb2dd1e6d1bfb7c21722cd42ab6443b9ee5fc3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-19 11:49:17 +00:00
Tobias Hunger
5162596fe8 ProjectExplorer: Fix listing of project nodes in the wizard's summary page
The wizards summary page did no longer list existing project nodes. Wire up that logic
so that projects and files can finally get added to existing qmake projects again.

Task-number: QTCREATORBUG-17994
Change-Id: Icc019bdf0f569440eaa01c55fc69b17e7f831b20
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-04-19 10:50:58 +00:00
Andre Hartmann
2ff642d8e4 CustomToolChain: Allow MSVC output parser on non-Windows systems
To do that, move the existing enumeration-based system to a
string base. MSVC/Windows and Custom/Unix shared the same
enumeration value (3), so we must provide an operating system
aware upgrade path.

Task-number: QTCREATORBUG-16247
Change-Id: I8beeeabc09119fc501933a7287f2f982195363a2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-19 10:24:46 +00:00
Christian Stenger
45a5f47e01 QmlJSTools: Test: Fix used qml file
Former welcomescreen.qml is gone. Use another qml file to perform
the test.

Change-Id: Ibb6a143eab96202e152c799dc394a305f9db405d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-19 09:52:12 +00:00
David Schulz
e19620ddd5 Debugger: Warn about unsupported shell commands when using cdb
Task-number: QTCREATORBUG-6927
Change-Id: I20e2311d5069da9315a7b5a5bc8d698fe5e6e52b
Reviewed-by: hjk <hjk@qt.io>
2017-04-19 09:05:16 +00:00
David Schulz
890e7546e4 Debugger: Merge prepareCommand
Change-Id: Idd316a88ae39d563c99d3b4081f88fc41e604499
Reviewed-by: hjk <hjk@qt.io>
2017-04-19 09:05:09 +00:00
Montel Laurent
d29396b164 Use qEnvironmentVariableIsEmpty or qEnvironmentVariableIsSet directly
Change-Id: I4f2e61e4bade9e7b4518d144db8163e596ab6264
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-19 08:00:14 +00:00
Eike Ziller
88897f3a87 Merge remote-tracking branch 'origin/4.3'
Conflicts:
	src/plugins/genericprojectmanager/genericproject.cpp
	src/plugins/genericprojectmanager/genericproject.h
	src/plugins/genericprojectmanager/genericprojectnodes.cpp
	src/plugins/genericprojectmanager/genericprojectnodes.h

Change-Id: Ie0c870f68c8d200a75489b75860987655b2f6175
2017-04-19 09:56:14 +02:00
Orgad Shaneh
2f8c2d8864 C++: Use Utils::transform() in BackwardsScanner
Change-Id: Iec2c2db7afd8e5fe463a32c6b5167592cdd7617c
Reviewed-by: Laurent Montel <laurent.montel@kdab.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-19 07:45:53 +00:00
Nikolai Kosjar
8c7079dd24 Beautifier: Fix leak of GeneralSettings
Direct leak of 24 byte(s) in 1 object(s) allocated from:
    #0 0x4f06b0 in operator new(unsigned long) (/home/nik/dev/creator/
ut/4.2_asan/bin/qtcreator+0x4f06b0)
    #1 0x7f4ac0e5d068 in
Beautifier::Internal::BeautifierPlugin::initialize(QStringList const&,
QString*) /home/nik/dev/creator/ut/4.2_asan/src/plugins/beautifier/
beautifierplugin.cpp:214:25
    #2 0x7f4ada1bb769 in
ExtensionSystem::Internal::PluginSpecPrivate::initializePlugin() /home/
nik/dev/creator/ut/4.2_asan/src/libs/extensionsystem/pluginspec.cpp:
1001:10
    #3 0x7f4ada1694b1 in
ExtensionSystem::Internal::PluginManagerPrivate::loadPlugin(ExtensionSystem::PluginSpec*,
ExtensionSystem::PluginSpec::State) /home/nik/dev/creator/ut/4.2_asan/
src/libs/extensionsystem/pluginmanager.cpp:1404:9
    #4 0x7f4ada15b2b6 in
ExtensionSystem::Internal::PluginManagerPrivate::loadPlugins() /home/
nik/dev/creator/ut/4.2_asan/src/libs/extensionsystem/pluginmanager.cpp:
1239:9
    #5 0x7f4ada15ac6f in ExtensionSystem::PluginManager::loadPlugins() /
home/nik/dev/creator/ut/4.2_asan/src/libs/extensionsystem/
pluginmanager.cpp:362:12
    #6 0x50a97c in main /home/nik/dev/creator/ut/4.2_asan/src/app/
main.cpp:517:5
    #7 0x7f4ad65b282f in __libc_start_main /build/glibc-Qz8a69/
glibc-2.23/csu/../csu/libc-start.c:291

Change-Id: Iff1fd908d9a59b98e895599b1d73ca16536eee11
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-18 17:44:45 +00:00
Andre Hartmann
8b6eb5aabb CustomToolChain: Replace foreach with range-for
Change-Id: Iad07a0ccef5cc3c0217b14039abfcdaf63ac1f3b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-18 17:42:48 +00:00
Orgad Shaneh
530c248051 Core: Fix compiler display name for MSVC2017
Change-Id: I0a0a6e2899373241dac0cdec5154ea7f22efd0c2
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-18 08:43:13 +00:00
Alessandro Portale
bc35392123 Core: Handle an invalid theme id from the settings
Don't crash if the settings contain an outdated/invalid "CreatorTheme"
entry.

This change makes ThemeEntry::themeSetting() validate the entry. If no
theme with that id exists, it returs the default/first theme instead.

Task-number: QTCREATORBUG-17517
Change-Id: I87658fade33ba4d956d3a4c5591dd86db4051426
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-15 22:23:04 +00:00
Montel Laurent
4fcbf91d30 Use toByteArray() directly
Change-Id: Icaa88b711285307a6d242067eaca9db852ded04f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 14:57:58 +00:00
Montel Laurent
5d27bc747b Use QFileInfo::exists(...) which is faster that QFileInfo(..).exists
Change-Id: I0d2e61d84c74e60ef4f54074a4ca00f2d0835562
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 13:18:28 +00:00
Montel Laurent
f976dc96fd Reserve some elements
Change-Id: Iceef4e9a6f213a747045db3b06a5608d77652f98
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 13:18:17 +00:00
Montel Laurent
f18ae4ff6f Don't use return keyword when not necessary
Change-Id: I4b9fad1eee60e942ddbccda53a4af27e978df498
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 11:02:14 +00:00
Andre Hartmann
0d1fef41f7 C++ Disable bool keywords in C files
The keywords bool, true, and false don't exist in C90.

When using C99 and stdbool.h, they are defined as macros.

Amends commit 7b2c09a118

Change-Id: I2f2391dd11be841d7d7b249db0b4add8523e53a5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-14 07:59:48 +00:00
Christian Kandeler
660c4ced86 QbsProjectManager: Fix collecting unreferenced build system files
We cannot use std::set_difference on a QSet, because those are not
sorted.

Change-Id: I6238a2bd06bcc6e5dba64572f0c3b0caaa57a7eb
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-04-13 09:21:37 +00:00
Christian Kandeler
4b39baa8c1 QbsProjectManager: Add project file nodes for sub-projects
They got lost somehow during the project tree refactoring.

Task-number: QTCREATORBUG-17859
Change-Id: I1d1178c3d0932322604e7035f15dcc4490309ca9
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-13 09:19:36 +00:00
Christian Kandeler
b520a90644 QbsProjectManager: Add unreferenced build system files to the right node
They ended up as children of the root node somehow during refactoring.

Change-Id: I2da3ac74369fd9456b62839f1498f84f0034a85c
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-13 09:19:04 +00:00
Thomas Hartmann
c50fbf2450 Fix Toggle Right Sidebar shortcut on Windows
Ctrl+0 is used for the left sidebar on Mac,
so it should be save to use it for the right
sidebar on Linux/Windows.
The original shortcut (Ctrl+Shift+0) is used by Windows 10
and therefore does not work.

Task-number: QTCREATORBUG-17857
Change-Id: I832135c3779508b9789b5be4757e1bbc9bd255eb
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-04-12 16:18:44 +00:00
Christian Kandeler
399a1c9c7d Android: Fix build with namespaced Qt
Change-Id: Iecd44b8da2a5d35f6f98ea4a9b142853b73f25fd
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 14:50:21 +00:00
Christian Stenger
a01507e90e CPaster: Fix pasting to KDE paster
Add minimal handling for credentials.

Task-number: QTCREATORBUG-17942
Change-Id: I5f3821fa944fa7800bd1f51947f46d301e2b00b8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-04-12 14:17:20 +00:00
BogDan Vatra
d4ca232d54 Android: Improve application output window by adding filters
- allow the user to choose the visible log levels
 - allow the user to choose which activities/service(s) logs are visible
 - wakeup the device (API 20+)
 - use only the most recent logs (API 21+ add "-T 0" to logcat params)
 - use logcat -v time format, which is the same on all Android versions

In the future we can even allow the user to choose which parts of the
log line are visible, e.g. time, log level, TAG, PID, Message

Task-number: QTCREATORBUG-16887
Change-Id: I07ce00aff59a479660f5ac6da75eef973ba3f627
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-04-12 13:57:34 +00:00
Vikas Pachdha
8dc98995fa Android: Force Gradle build post SDK tools version 25.3.0
Task-number: QTCREATORBUG-18013
Change-Id: Ic912427783d079f5f6bf06e3bf9a44657d24a96f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 13:54:24 +00:00
Vikas Pachdha
70be880bcb Android: Use avdmanager tool
android tool is deprecated since sdk tools version 25.3.0.
Use the new avdmanager tool

Task-number: QTCREATORBUG-17814
Change-Id: Id6f495f14e12d0069df08164cac1929b76d9e932
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 13:42:10 +00:00
Vikas Pachdha
05b77e8468 Android: Use sdkmanager tool
android tool is deprecated since sdk tools version 25.3.0.
Use the new sdkmanager tool

Task-number: QTCREATORBUG-17814
Change-Id: I96446f5a64c1c400066b4ac7771c8c7e1bf567ed
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 13:41:48 +00:00
Vikas Pachdha
2b5f5abb2b Android: Add system image information for each platform
Groundwork for the new sdk and avd management tool's integration

Task-number: QTCREATORBUG-17814
Change-Id: I3e46f6d3aa56c0f16dd66d0b1d731043e180e012
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 12:45:42 +00:00
Vikas Pachdha
198c83ea70 Android: Add Android tool manager
Refactor the use of android tool and groundwork for the new sdk
and avd management tool's integration

Task-number: QTCREATORBUG-17814
Change-Id: I6a5920f9ba92508f904cd8cf28bf62c82de2d820
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
2017-04-12 12:45:30 +00:00
hjk
5d97c4871a ProjectExplorer: Remove startRunControl()'s runMode parameter
It is redundant, as a RunControl has a runMode() getter.

Change-Id: Ia048b271a5003356d21f86a3f778827d23466037
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-04-12 12:11:49 +00:00