Commit Graph

44854 Commits

Author SHA1 Message Date
Tobias Hunger
33c0b69326 CMake: Use algorithm in CMakeBuildStep
Change-Id: I7d3f5e08b15d91759a9c816dd1223bf8be8c40f8
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-08 08:47:01 +00:00
Tobias Hunger
e4cdad309d CMake: Move MakeStep to CMakeBuildStep
Change-Id: I2a3432acd90cc27fb444ab30c3239497a51e01df
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-08 08:46:58 +00:00
Tobias Hunger
2ce52e3288 CMake: Use "clean" target
Use the "clean" in the MakeStep to clean up.

Change-Id: I7da29866a7dfc6debd70e83cc61f89b809a81cac
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 08:11:44 +00:00
hjk
18bd8b8af6 Adjust after upstream AnalyzerStartParameter changes
Change-Id: I92a6dcee0c201905132e069291eb40e6da6da128
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2016-01-07 18:18:51 +00:00
hjk
8150209ff7 Analyzer: Slim down AnalyzerStartParameters
* SysRoot can always be determined from kit.
* Pass around RunMode as extra parameter
  not as part of AnalyzerStartParameters.
  That's closer to the pattern used elsewhere.
* Environment was always initialized from the runconfig's
  EnvironmentAspect. The tools can do that directly.
* Provide setter for display name for cases where
  it is not equal to RunConfiguration::displayName

Change-Id: I811a0d7cdeb55cc37a16a593b3942abb567a2150
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2016-01-07 18:11:09 +00:00
Tobias Hunger
3120692092 ProjectExplorer: Use Qt5-style connects and clean up
Clean up code a bit: Remove private slots, etc.

Change-Id: I745925c76ed4e0be69a11ca911741309fc4286e7
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-07 17:29:06 +00:00
Tobias Hunger
d134bdfb13 Project: Sprinkle override over all the projects
Change-Id: I5e03ef5a9fee03473152f8a7511d75a1818c3e05
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-07 17:23:29 +00:00
Tobias Hunger
5915b66fc8 qmake project: Use Qt5-style connects
Change-Id: Ie82f4a0228a672fd7da35e35d2a000c0cc3c533a
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-07 17:13:36 +00:00
Christian Stenger
b17fbfcd75 Tests: Fix compilation
Introduced with 33ad0f1031.

Change-Id: Icbee16c3e4e771a81e885d3daa3a5386960ecbd8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-07 15:57:18 +00:00
Christian Stenger
d661d4a188 Utils: Fix maskToColorAndAlpha()
This produced wrong disabled icons on some platforms.

Change-Id: I3a80ac7f5e1fd5027d665e5791df802c78e2113a
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-07 15:02:23 +00:00
Orgad Shaneh
2c6d7519a0 Locator: Simplify list filtering
Change-Id: I06556a6ea2151074796d462096e1c9e70e348397
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-07 14:16:54 +00:00
Tobias Hunger
5419b02058 CMake: Make sure there is a "clean" target
Change-Id: I9e3eb49b7f5a2d7d5c89a53969c4703b3ce99330
Reviewed-by: Cristian Adam <cristian.adam@gmail.com>
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 12:55:35 +00:00
Orgad Shaneh
16b1430d2a Locator: Fix handling of prefix with empty input
For example: "f ", "m ".

Broken by b6e4e966f4.

Change-Id: Ic1e389c52579c86479e2c066eadfb4aaf4b66700
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-07 12:39:55 +00:00
Artem Chystikov
98cb40903b Implement go to previous split feature
These changes allows users to move between splits
using the hotkeys not only clockwise, but counterclockwise too

Change-Id: I2a30bc0cd869881c525674d7e40e622b4b3dc7f6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-07 12:11:11 +00:00
hjk
049ffa2c10 QbsProjectManager: Modernize qbsrunconfiguration.{h,cpp}
Qt 5 connects, some auto, remove unused members, etc.

Change-Id: Ic9daaf0356d9a9e29f55467360674edc66be83ee
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-07 10:47:07 +00:00
Tobias Hunger
2b69693828 CMake: Store project name in root node
Store project name in root node and remove the member variable
that was used for this purpose from the CMakeProject.

Makes sure the same name is used more consistently.

Change-Id: I2b60a15143934bdeffe6c744fd300be7e81c674e
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 10:37:00 +00:00
Tobias Hunger
bbed47b646 CMake: Remove some repetitions
Change-Id: Ie3dc64cb311a2df297dca63f7eb369e749046cf3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-07 10:36:54 +00:00
Orgad Shaneh
af1127f757 VCS: Do not delete SubmitFileModel before setting the new one
setFileModel() calls QTreeView::clearSelection() before setting the new model.
If the view has no model (because it was deleted earlier), a warning is shown.

Change-Id: Id694b073360b08bd8fd4e8b1db04250a71f792c1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-07 10:24:57 +00:00
Tobias Hunger
6a17eafa05 CMake: Use Utils::algorithm
Change-Id: I6d15c9e68c2e9680668509022d8a771e4c7c595a
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
2016-01-07 10:15:40 +00:00
Eike Ziller
ad6c0f9bc6 Merge remote-tracking branch 'origin/3.6'
Change-Id: I8f034f91de04e319dd5ba24b8837f1daca54d918
2016-01-07 11:01:14 +01:00
Eike Ziller
895550844d Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	src/plugins/clangcodemodel/clangcodemodel.pro

Change-Id: I742f4a0d0aebae029ac361fc4f55d222ff2d65b2
2016-01-07 10:11:12 +01:00
Orgad Shaneh
68ef643af3 Debugger: Refine newline replacement in status message
Replace newlines with a semicolon followed by space

Change-Id: I99b1a802248787546f7b2a1483a69201ea9daaed
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-07 07:21:24 +00:00
hjk
3eaa734cc3 Debugger: Better support for "raw" QByteArrays and char[]
Display 'cooked' character as well as numerical value in both decimal
and hex.

Task-number: QTCREATORBUG-15549
Change-Id: I7f8f9efe07573b452ff44501bfca5e29e9ab437c
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-07 07:14:44 +00:00
BogDan Vatra
6ff1296822 Android: update gradle wrapper properties
We need to call it when QmakeProject emits proFilesEvaluated to be sure
AndroidPackageSourceDir is set.

Task-number: QTCREATORBUG-15568
Change-Id: Ia70e0cff1b5fb8f2003ba2c2799a694873b2ad19
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2016-01-06 18:18:24 +00:00
BogDan Vatra
4c16632f8e Android: Add clean step only if the minSDK is changed
Task-number: QTCREATORBUG-15533
Change-Id: If78b5c7f379e590ec7c0bbeb53dd9b45343f64b8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
2016-01-06 18:18:01 +00:00
Ulf Hermann
419b2951fd Cmake: Fix problems with QString / Utils::FileName conversions
Change-Id: I47acade7b240b622ef7e49155700c1240f7ce70c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-06 15:48:48 +00:00
Orgad Shaneh
cb501d4824 ProjectExplorer: Use FileName in WorkingDirectoryAspect
+ use native separators for user visible strings

Change-Id: Id6e4e27db369314f70e355a395cfddca12b8ea90
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 14:29:23 +00:00
Orgad Shaneh
44539772a3 Designer: Remove a redundant separator transformation
FileName::fromUserInput uses QDir::cleanPath, which transforms the separators.

Change-Id: I951140e38957f0f3dd5b2ef125e76ffdb04a2da2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 14:29:08 +00:00
Ulf Hermann
ffa0c86617 QmlProfiler: Allow multiple events views loaded from plugins
Change-Id: Ifaf4e63f4a843a42a1a22f005e87d8c1a4604686
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:28:24 +00:00
Ulf Hermann
e4efb9bb3b QmlProfiler: Retrieve common actions from ActionManager
This removes the need to pass the QmlProfilerTool instance to all views.
QmlProfilerTool is exported so that we can access the common actions
from plugins.

Change-Id: Ie7072c23ef35763b729f4b87acce47ecbdb76e43
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:28:20 +00:00
Ulf Hermann
c16b843ecc QmlProfiler: Remove "Limit to Range" option from statistics view
You don't see the range you are limiting to in the statistics view, so
I doubt that anyone has ever understood what this does.

Change-Id: Ic9da3c1ac067f76d239a931d316a69a3999884a4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:25:19 +00:00
Ulf Hermann
3cd2d375ff QmlProfiler: Rename QmlProfilerEventsModelProxy
It is only used for the statistics view.

Change-Id: I71027dd864715b4a2f95c2b11af0c0d83c514229
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:25:15 +00:00
Ulf Hermann
4223d76c48 QmlProfiler: Rename "events" to "statistics" view
Change-Id: Id552e0ead056214a7d72dd618c54897b55cd5e38
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:25:08 +00:00
Ulf Hermann
df4e46ff02 QmlProfiler: Reduce external interface of QQmlProfilerEventsWidget
Change-Id: I06a610cca606b98bc3f5741c1363b98f2b28d7eb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:22:43 +00:00
Ulf Hermann
01e4ba4a10 QmlProfiler: Move constants to qmlprofilerconstants.h
Change-Id: Ic4f1b02bbf9e1467811334a16cd9c13d1924c47e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:22:09 +00:00
Ulf Hermann
4e29a946c7 Add flamegraph view
Change-Id: I001053b63d27adcbbdfd95abb2b45f5f5fa05447
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:20:47 +00:00
Ulf Hermann
b85598ecd3 Add flamegraph model
Change-Id: I0c5b837dd649f95495ef2ef36523d455a59103f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2016-01-06 14:20:42 +00:00
hjk
b769156c19 Debugger: Mark pending C++ breakpoints with hour glass icon
Change-Id: If012953f8fb1e2705244ffe9f02c6bbbbc9d93c1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-06 14:06:43 +00:00
hjk
31abbba961 Debugger: Make Watchpoint setting more robust with LLDB
At least on Linux/LLDB 3.8 trying to set watchpoints at fixed address
produces breakpoints with .IsValid() == False that choke on accessing
certain functions like .IsOneShot() used e.g. in breakpoint data
reporting.

Now report the .IsValid() state and skip the reporting of the "bad"
fields.

Change-Id: I742ed171f37763f3dbbd896173c527817edf3a6e
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-06 13:30:43 +00:00
Nikolai Kosjar
05e372c6ea Git: Fix build with Qt 5.4
Change-Id: Ibbbf80eb50aa3226d7f953033edcc7d2458fe237
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-01-06 12:38:34 +00:00
Jochen Becher
d33e86a4be ModelEditor: fix warnings from MSVC compiler
Change-Id: I4fe87d071fafa16ef2beaee2559dc96d0a10c4e0
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-01-06 12:29:33 +00:00
hjk
e22f8e37e4 Debugger: Fix transfer of object address with LLDB
For opening memory editor etc. This was a regression after protocol
changes in 525c33f99.

Change-Id: I519ab744122547bd5d0094675dbd471d8e77e98c
Reviewed-by: Alexandru Croitor <alexandru.croitor@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-06 12:09:42 +00:00
hjk
3c37941829 Debugger: Make accessing value of invalid pointers more robust
LLDB on Linux did not like a plain toInteger() in some cases.

Change-Id: I4fb640df52218a3df04f3ce5092eb5fbc8b5acd5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2016-01-06 12:00:53 +00:00
Jochen Becher
6fb131de98 ModelEditor: Improve reverse engineering of template classes
Change-Id: Ic62c8b6f7f08203c2b4f52d1fcb381d8ec61c834
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:41:52 +00:00
Jochen Becher
57ceb15692 ModelEditor: Add action for inplace editing
Pressing "Return" activates inplace editing, Shift+Return activates
properties.

Change-Id: I67601a439d27f9d322a3a88f7706d26f75faaab8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:41:37 +00:00
Jochen Becher
83368083d1 ModelEditor: Fix opening parent diagram
Open ancestor diagram if parent package contains no diagram.

Change-Id: I3c0aa9b87a1cb483177c5d1b6766345a3aa0d379
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:41:27 +00:00
hjk
9a570d4786 QmakeProjectManager: Initialize working directory to default values
This fixes a regression introduced with e0fdeaa6.

Task-number: QTCREATORBUG-15567
Change-Id: I9da93520b9d5ff14b9b00810b23d9bab333e0073
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:24:21 +00:00
Orgad Shaneh
70958c4c07 Git: Reduce indirection in submit editor
Change-Id: Ic4e897d5c8ec82dbbffd5bd9fe9af84491c4402f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:08:34 +00:00
Orgad Shaneh
eb375d734d Git: Do not suggest to continue command when commit editor is active
When executing mergetool from the commit editor it is unlikely that the user
wants to do anything but to commit.

Change-Id: I1302951c4afee554b35a261d60f402b56c077681
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:06:53 +00:00
Orgad Shaneh
1dc90bcf44 Git: Force update file model when mergetool is done
Flow:
* Open a commit editor with unmerged files
* Double-click an unmerged file
* Resolve the conflicts with the mergetool, save and close it
* The window is activated and the file model is refreshed immediately, before
  the mergetool process has exited.

When the mergetool exits, repositoryChanged is emitted. Use it to refresh the
file model again.

Task-number: QTCREATORBUG-15569
Change-Id: Ibce7301bc46fe3a5a378a4c15b882e1bb6bbf3c3
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-06 10:06:22 +00:00