Commit Graph

1631 Commits

Author SHA1 Message Date
Christian Kandeler
4b73fa190c Fix build with namespaced Qt.
Change-Id: I6c84282de364491e92ecd3cf668db62351067f88
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-14 19:21:33 +01:00
Kai Koehne
de07c16a71 QmlProfiler: Fix memory leak
Change-Id: Ieed04f3a11d2685de55b70ab501969778f6fc1dd
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-14 12:32:06 +01:00
Kai Koehne
bd28997385 QmlProfiler: Properly initialize variable
Change-Id: I9ecc8807b9319a6317e8f5f5711deadb45031f75
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-14 12:27:10 +01:00
Christiaan Janssen
b7304e2f2e QmlProfiler: Refactor
The code of the qmlprofiler client has become a bit too complex,
this patch reorganizes the modules in a more sensible way,
having the modules communicate with each other through a
state machine instead of the excess of signals and slots
from before.

Change-Id: I76f7313779888a1bd07a1cdb1acbf2e47aacf42a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-14 11:38:25 +01:00
Friedemann Kleint
489feeae15 Compile with Qt 5.
Add either QtDeclarative (Qt 4) or QtQuick1 (Qt 5) to QT.
Mixing them leads to problems with include paths and linking.

Change-Id: I188240641216ee227931a7be2105bc4838385c79
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-13 17:20:50 +01:00
Eike Ziller
4b8df15f3d Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/plugins/remotelinux/startgdbserverdialog.cpp

Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
2012-03-08 07:48:55 +01:00
Daniel Teske
5585426efc Ui: No spaces before "..."
Change-Id: Ic76ef1bea53e2cf5c2d109688247e84c1aa70f6b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-03-07 16:14:55 +01:00
Friedemann Kleint
4e83fb7953 Port Qt Creator to the new plugin system of Qt 5.
- Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN
  for Qt 4.
- Generate the Json files for Qt 5 from the pluginspec
  files by using a XSLT sheet.

Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-03-02 14:13:49 +01:00
Kai Koehne
3f00faa9ef QmlProfiler: Always use quint16 for port number
Change-Id: Ie77227058637c4900248eaca0ea183ad46b82663
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-03-01 15:08:40 +01:00
Kai Koehne
705b2efe87 PortList: Move to utils
Change-Id: I99dbef56a2a5b06bb4b89ca442e44bf586efdb22
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-03-01 09:46:22 +01:00
Kai Koehne
c90cca7904 QmlProfiler: Don't print assert when trying to connect a second time
This can happen when e.g. the first attempt failed because of an
unavailable port.

Change-Id: I7e61c6f6d0a65c48c1b7031be95bdabd965fe5ab
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-02-29 16:36:40 +01:00
Orgad Shaneh
164db0feeb qbs: Cleanup
* Removed utils, extensionsystem and aggregation dependencies
for plugins that depend on Core
* Capitalized Find and CPlusPlus

Change-Id: I505e5f46976f26da47ad778860f103b173668b1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-02-28 08:58:11 +01:00
Kai Koehne
742019e301 Debugger: Fix QML-only debugging on Harmattan
Actually wait for the 'Waiting for debugger on port ' ... message
to appear in the application output before connecting, and also
use the port specified there.

Change-Id: Ib498e5306bc49f2f3d468353b1c5d1ea38a809e6
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-02-23 15:46:46 +01:00
hjk
503c6e2684 projectexplorer: Make the debugger language chooser a (hardcoded) "aspect"
This is the first step of a larger refactoring. The plan is to make
debuggersettings more orthogonal to individual runconfiguration
implementation. This patch alone already pushes the settings handling
to the debugger plugin and removes code duplication in the
runconfiguration implementation.

Change-Id: I4c78d1658ea462d3df14b873f8f41cc918a23f1a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-21 12:21:38 +01:00
Joerg Bornemann
ff92cdec43 add qbs files
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38
Reviewed-by: hjk <qthjk@ovi.com>
2012-02-20 19:18:18 +01:00
Christiaan Janssen
ffe4ddf0b2 QmlProfiler: fixed error in 1322a73efd caused by rebasing 585e651310
Change-Id: I6874eeed4d173d566998419b8349bcfc69b14bdb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-17 18:19:39 +01:00
Christiaan Janssen
1322a73efd QmlProfiler: read trace when application ended by the user
This patch avoids showing the "use the stop button" if the
application dies but the trace data was sent in time.

Note: with the current implementation in Qt5, the application
sometimes closes before all data could be sent.  That happens
with any non-trivial qml application.

Change-Id: Ie7b1568b2d69320d1887587dccac40a4b4d4d788
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-17 17:25:00 +01:00
Christiaan Janssen
1fca414997 QmlProfiler: cleaning events pane when stopping from server
Change-Id: I0e215b16d1a07124579a8ae593c13c8571d24ab8
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-17 17:24:40 +01:00
Christiaan Janssen
585e651310 QmlProfiler: manage server-side start tracing message
also
QmlProfiler: refactor eventlist state

If unexpected data is received, assuming server stopped profiling.
Also, introducing a eventlist state instead of relying on
signals sent around.  This is part of a coming bigger patch
where the profiler client is refactored.

Change-Id: Ibed9007903956daf03cc0fcb90f77b5ad2d3cf90
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-17 17:22:23 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Christiaan Janssen
5d28d58c57 QmlProfiler: fixed font rendering problem on OsX
Change-Id: I86b4474aeadb991ba8591784945371e8ac925b00
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-10 16:45:57 +01:00
Christiaan Janssen
bd438d1c5c QmlProfiler: display binding loops
Change-Id: Ib553f67b25e614bd210959ce82bc970daa228fdb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-08 16:02:17 +01:00
Christiaan Janssen
584df4d8db QmlProfiler: fix rendering bug on bottom shadow
When resetting data, the variable that tracks vertical scroll
on the qml side could go out of sync with the scroll bar.
Fixed by resetting both scrollbar and variable at reset.

Change-Id: I3a130192d460568c44de815d71aa6290c311c89a
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-07 10:38:21 +01:00
Christiaan Janssen
eca36a23d1 QmlProfiler: hiding extra statistics by default
User can choose to see them through the context menu.

Change-Id: Ibf1670098126658af497c7a87b46c26f6dd2d41e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-07 10:38:11 +01:00
Christiaan Janssen
3ae24416aa QmlProfiler: prevent crash in events pane
When selecting event before the timeline has been
rendered at least once.

Change-Id: I8f34ebacb948163f57e3c2bc893d17c745366294
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-06 17:18:22 +01:00
Christiaan Janssen
95f1bb190f QmlProfiler: scroll automatically when selecting events out of view
Change-Id: I2f242895b00792d2e6930ec642209be886e22bad
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-03 17:09:50 +01:00
Christiaan Janssen
881f217099 QmlProfiler: reposition dialogs inside timeline when scrolling
Change-Id: I5082b8bfb8f9ab242b18a1942aa831145d3e9d06
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-03 15:48:32 +01:00
Christiaan Janssen
a50e447a81 QmlProfiler: reseting completion flags in traceclient
When the server sends more than one trace consecutively
(e.g. with the profiler JS API), the flags that control
the race condition between the v8 client and the qml
client need to be reset after the data is read.  Otherwise
the complete signal will be duplicated.

Change-Id: I63b808d6f0aae404814d5243c1729671b56ca52e
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-02-02 17:10:06 +01:00
Denis Mingulov
a36d587ccf Fix non-needed usage of QString's fromLocal8Bit() and fromUtf8()
QString::fromLocal8Bit() and QString::fromUtf8() are much more slower
than an obvious QString::fromLatin1() and QLatin1String(), so this
commit changes some places where these functions are really not
needed.

QString::fromLatin1() is used in case if QString object is used
immediately (something like QString::fromLatin1().arg()),
QLatin1String is used otherwise like in other places (for example,
QPixmap(QLatin1String("..."))) - to allow to use default QString
constructor and work with QT_NO_CAST_FROM_ASCII.

Change-Id: Ib6eb1c61e9cb35c7c5b7569fea77c5e41d32621a
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 17:50:45 +01:00
hjk
2df4cb21fe Core::ModeManager: make some functions static
Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-01-27 14:52:24 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Christiaan Janssen
b33a654b8b QmlProfiler: avoid selection jumping between views
The JS profiler doesn't use column information.  This can produce
undesired side effects when changing the selection from the
QML pane if the signal bounces back.

Change-Id: I76d8c97c53b0c4800f855054cdb5ff5e8d034d65
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-24 15:44:31 +01:00
Kai Koehne
927fb4c7c9 QmlProfiler: Fix taking using address of profile
Fix gcc error: taking address of temporary

Change-Id: I24e9be4a5e351f61b151a502bb3ca3d52473f41d
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-23 14:09:12 +01:00
Christiaan Janssen
2163f789b1 QmlProfiler: rewriting details for bindings
Change-Id: Ie180ecc8d336bca1713edd5eb5fff0681c641b9d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-20 17:06:23 +01:00
Christiaan Janssen
1958fd82d5 QmlProfiler: reading column information in bindings
Change-Id: I1a99c3508de733d98eb99f41419eccfdca030fe0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-20 12:18:50 +01:00
Christiaan Janssen
3c0ae08e0c QmlProfiler: unicode for mu
Change-Id: I33e2cb6557aeebbd8931ab6a22074da3008c07f9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-01-13 14:54:56 +01:00
Kai Koehne
f0a82fe63e QmlProfiler: Coding style fixes
Change-Id: I302ea39510043b53464af47c45210c19dd232690
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-13 12:33:23 +01:00
Christiaan Janssen
5fede0d497 QmlProfiler: tooltips for the labels column
Due to space restrictions, the descriptive text of events
in the labels column of the timeline view are elided.  This
patch adds tooltips on mouseover with location and details.

Change-Id: I229988e114f21e4d9575dff137aa91918ad1afa3
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-13 11:28:43 +01:00
hjk
a6ff74c0d8 ProjectExplorer: use enum instead of QString for run mode
Change-Id: Ia906944a489b09afdea59f74afbf759b4caebe37
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-11 13:52:26 +01:00
Christiaan Janssen
2ddf2a1d81 QmlProfiler: fix issues with animations in the timeline
Change-Id: Ief2351cf7d19f580c08cc557ffa0f5975e918e56
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-01-11 13:36:32 +01:00
Alessandro Portale
7797935287 Fix a text artifact (overlaid ':' character)
The ':' text item in Detail.qml was visible in RangeDetails
and SelectionRangeDetails. Looked like an irritating text
rendering artifact on the left of the Deatil labels.

I assume that the Text Item was of no use and removing it is
fine.

Change-Id: Ic9c4eec495219b288d18d2179197ffaf01e00afe
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-01-09 14:21:04 +01:00
Nicolas Arnaud-Cormos
4a8432112a Analyzer: create a run control factory for all tools.
Having one factory per tool (or plugin) created some bugs:
 * analyzer project settings being created twice
 * per-project analyzer settings widget duplicated
Also, most of the code from the run control factory were copied.

Now, the Analyzer only creates one run control factory shared among all tools, and the IAnalyzerTool
has two new virtual method: canRun and createStartParameters. It simplify the code a bit, and
creating a new analyzer tool is easier (only two classes to subclass: IAnalyzerTool and IAnalyzerEngine).

Change-Id: I4e180846a26b74b2b77cb99bc97534d680a80a4d
Reviewed-by: hjk <qthjk@ovi.com>
2011-12-28 18:25:56 +01:00
Christiaan Janssen
9e5dc72bb9 QmlProfiler: fix repaint issues in timeline overview
Change-Id: I4db50cd61dd5c9741168a06831d08a3b54801ac6
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-21 13:18:32 +01:00
Christiaan Janssen
52b3138a38 QmlProfiler: display animation traces from Qt5
Change-Id: I7959052ec07089419e85186b0b0e58f911e273ec
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-20 17:15:56 +01:00
Christiaan Janssen
eef3d91ea1 QmlProfiler: linking JS events with QML events
Change-Id: Id2f37caef0c62fa8fa830fed8f46dcbb0a565cdb
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-14 16:49:36 +01:00
Christiaan Janssen
001425e6ba QmlProfiler: showing children time and count in events pane
Change-Id: Ia285d1c84312e6a314fbf1c59c62b571b4c3e7d4
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-14 15:26:45 +01:00
Aurindam Jana
28844621e4 QmlProfiler: Show profiling data initiated by console APIs
The profile clients now also listens to profiling data sent by
console APIs console.profile and console.profileEnd

Change-Id: I7f7100448263889076e94a1e251b8977ce047843
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-12-14 11:39:19 +01:00
Christiaan Janssen
7daa3095ce QmlProfiler: fix double-load problem caused by 25d351fa
Change-Id: Ib60cb122188e286c596e0595e38bf2814db6d487
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-08 17:49:46 +01:00
Christiaan Janssen
72c06cb6fd QmlProfiler: timers for all profiler activities
Change-Id: I2ecbf4d1d90e353506e7c164560b69b81fcc6c66
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-12-07 10:46:01 +01:00