Commit Graph

177 Commits

Author SHA1 Message Date
hjk
aadb6f16af SessionManager: Apply 'static' pattern
Change-Id: I370f72fcf7a24216ee189979ce6b5c8bfc5f4140
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-09-05 12:28:12 +02:00
hjk
d66369e21d Core/Help: Clean up HelpManager interface and users
Change-Id: Ia6edf583f2a002d7c6f4878df670a78614ea087d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:34:39 +02:00
hjk
4a24df38a3 EditorManager: Use static pattern, adjust surrounding code
Change-Id: I3255a0150cd9a730336456c5a9f986eb74fefbff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-30 11:22:56 +02:00
Christiaan Janssen
0a3b20f5f9 QmlProfiler: reworked
Change-Id: I66a236a024d76e7bef6edfb91ae30b5dd098b76b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-08-09 17:19:32 +02:00
hjk
e94183ca2f Analyzer: Introduce AnalzyerAction
This wraps the menu related aspects of an IAnalyzerTool.

Change-Id: I065cb5f269a40af2137f434a7cdf915bd9a76839
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-08 17:41:39 +02:00
hjk
d95ae65c62 Analyzer: Use action as handle for tool plus start mode
Change-Id: I33f99f28fb99c21cc62cda57ec1ba1aa2963b065
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-06 16:14:41 +02:00
hjk
51b390cada Analyzer: Remove some explicit uses of Analyzer::StartMode
Change-Id: I6d28a533d4ee2e93e4b3407e7fdd670c45886708
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-05 17:09:22 +02:00
Aurindam Jana
f8a2698bcd IAnalyzerTool: actionId() is re-implemented in derived classes
Change-Id: I5a0a485e239eeb33a9d8ad8cfd0f9cc40e1ff6d2
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-05 15:43:44 +02:00
hjk
baed8a12ff Analyzer: Remove unused AnalyzerStartParameter::toolId member
Change-Id: I34e713ec1c9de99584ba206cfa1e38cd46e880fc
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-01 13:18:54 +02:00
hjk
cad3b13bbd Analyzer: Remove IAnalyzerTool::canRun
That's taken care of the run control factories directly now

Change-Id: I1cd7470e78a93459bee878f5e32594e7cf339a91
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-08-01 12:54:49 +02:00
hjk
3de45d8c55 Analyzer: Merge IAnalyzerEngine and AnalyzerRunControl
Change-Id: I74edaef59600a44924d2692c1ebc7f98d8581115
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-01 10:33:01 +02:00
hjk
2ba88d1c18 Analyzer: Remove IAnalizerTool::createStartParameters
That's a needless indirection. The run control factories know pretty
well what kind of start parameters they need.

Change-Id: Ia2d92beb6512cd99254fe22e215950cc67d5d0ed
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-01 10:32:24 +02:00
hjk
db2dc342f4 Analyzer: Simplify IAnalyzerEngine interface
Change-Id: Id5eac0145e04b809bf535087d3bb9a04124c2e87
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-08-01 10:32:13 +02:00
hjk
a5fa89145c QmlProfiler: Remove unused class member
Change-Id: I67b27bbe541054feec6642b6906360f99cdb5297
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-30 16:59:24 +02:00
hjk
004bbb0956 QmlProfiler: Don't store runConfiguration needlessly
Change-Id: Ie63ef0b1e2989c58de7d9bf92fa3cbc100608512
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-29 11:27:19 +02:00
Aurindam Jana
e88ec44e71 QmlProfiler: Remove RemoteLinux dependency
Change-Id: I3ff14691b4f9c80793a491b61444f8ceeb05a4fb
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-05-07 09:01:29 +02:00
Aurindam Jana
22fcb71a8e QmlProfiling: Attach to QML application
Redo the Attach dialog to use Kits. This is in sync with
the Valgrind Attach dialog.

Change-Id: Iaf0c8bc2c5a912b6a93ed21b9757a074a60041c0
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-29 15:50:51 +02:00
Aurindam Jana
253a8522bb QmlProfiler: Add members for QML port and host
Change-Id: If454497b87d84ce0f998edf7a99783ec833f352c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-04-25 09:28:24 +02:00
Aurindam Jana
686b63ea84 QmlProfiling: Support both IPv4 and IPv6
Change-Id: Idb0ceb27eabff33da3db52b0b62077083e8893ba
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 14:10:02 +02:00
Aurindam Jana
bd84ff7189 QmlProfiler: Query available port
Use QTcpServer instead of TcpPortsGatherer.

Change-Id: I12c53ae421fa559a7e71dd5855add2aff00ce33b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-18 12:28:43 +02:00
Aurindam Jana
cb4bfaf905 QmlProfiler: Use a port from the device port range
Check for free ports from the range of device ports instead of
using a fixed port.

Change-Id: I30b2e141ae6bce1ddd90294d4b802e2c9943424b
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-04-17 11:36:09 +02:00
Tobias Hunger
47abeac15b Use EnvironmentAspect to retrieve the environment
Change-Id: If878e22cc2715d05bb3e65ad908cd4fb5e21b03b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-04-11 15:15:08 +02:00
Tobias Hunger
533644290f Move DebuggerRunConfigurationAspect into Debugger
Change-Id: I03cab5d963a6d7c77171efe360a552d8109f6a8b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:25 +02:00
Tobias Hunger
e474b6ed8f Demote debuggerrunconfigurationaspect
NOTE: Next patch will be "Move DRCA to Debugger plugin" and is
needed to make this functional.

Change-Id: Ie405a0e4fbdc0fb35ff16d34c725e7aee5153a4a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-05 14:56:12 +02:00
Friedemann Kleint
01d4fe8520 Remove internal class BaseTextMarkRegistry from exported header.
Change-Id: Ieeffe65be2d7c8f07f41f7211853d616a6aceb85
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-03-26 17:03:08 +01:00
Daniel Teske
a60e8fa4f7 QmlProfilerTool: Adjust to MessageManager api change
Change-Id: I250e2b2398be4d692467f1ddb9c5fec8f7ea3be0
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-03-22 13:49:28 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Tobias Hunger
7a70b4f135 LocalApplicationRC: Rename files to localapplicationrunconfiguration.(h|cpp)
I ran once too often into them being called applicationrunconfiguration.(h|cpp)!

Change-Id: I280a3280173b80d4d955faddedf11688786eee14
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-01-28 14:46:47 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-08 10:48:18 +01:00
Orgad Shaneh
f739c85c72 QmlProfiler: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I99c96e723e80ec318acd9300b4f44e7c3ce37485
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-11-27 10:40:47 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-20 08:57:35 +01:00
Christiaan Janssen
342f684277 QmlProfiler: Detect interrupted execution
Task-number: QTCREATORBUG-8022

The profiler would switch to state "AppKilled" if the connection was
cut before all the profiling data could be read.  With Qt4.8, however,
the application dies before any data is sent at all, and such state
would never be reached.  This patch fixes the flow of states and
properly detects when an application started profiling successfully
but dies before delivering the data.  If the application doesn't run
at all (for example, launching a QtQuick1.1 app from Qt5), the
profiler fails gracefully without showing the error dialog.

Change-Id: I6fc53127b5dfe41de112e140b77895d430d3f79c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-17 13:12:28 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Jarek Kobus
4c96bd6791 Fix source strings
Change-Id: Ib56082091a1f7e3062ff48e981bb4ee8e2dd9357
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-28 14:16:10 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
hjk
6460254931 remotelinux: rename LinuxDeviceConfiguration to LinuxDevice
Change-Id: I7e8a99d3339d2040a23e4e78816b13b57197dcdb
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-01 14:26:28 +02:00
hjk
b906360a34 madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places.  Simplify remote linux runconfiguration

Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-26 12:50:06 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +02:00
Christiaan Janssen
84b4b52aed QmlProfiler: manage premature disconnection when app killed
The profiler tool was assuming that the socket would get
disconnected after the application was stopped by the user.
Sometimes it is not the case.  This patch manages the
oposite situation gracefully.

Change-Id: I4ae439bf2ce6caece37e97f735e980d18c446df0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:27:01 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Christiaan Janssen
9694dcffd1 QmlProfiler: adapt binding location at call to gotoLine
Change-Id: Iceff7120a5e88181e5aad452d3f0f90b3215ce1d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:47:47 +02:00
Christiaan Janssen
d1224783d5 QmlProfiler: use project file finder in detailsRewriter
Change-Id: I838180820da54baf0f334de36a8297bc8b461ccc
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:43:28 +02:00
Christiaan Janssen
cb12ef8f91 QmlProfiler: Set sysroot for embedded targets
Change-Id: Ieae3956a6ed47c40392b1f5bb2af8b97e01a19b0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 14:57:12 +02:00
Christiaan Janssen
ba9c802e1e QmlProfiler: manage receiving trace after app stopped
Change-Id: I97409748ebac3ee8af3690f2d84d3038638a3419
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 11:19:46 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
Christiaan Janssen
2afa559c2a QmlProfiler: show binding types
Change-Id: Iea469aa3e0fb7c4e5146163f049c930df6fc2b7d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-04 15:09:18 +02:00