Commit Graph

1631 Commits

Author SHA1 Message Date
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
2012-10-04 12:23:39 +02:00
Nikolai Kosjar
ed86a7ca58 Get rid of some Q_WS_X11.
This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 08:00:26 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Leena Miettinen
5ec5c2d772 UI text: fix capitalization and punctuation.
Change-Id: Ic312b7f78a65c7a2f17f3186f4f0ce7f0c1cf2ee
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-01 13:15:04 +02:00
Christian Kandeler
aef4280bc1 Do not use QWeakPointer to track QObjects.
This use case is deprecated in Qt 5. Use QPointer instead.

Change-Id: Id6c32542032656d7cb31cf838d93a680ab9e9327
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-25 10:45:36 +02:00
Kai Koehne
aafac06a24 QmlProfiler: Fix EXPORT macro logic
Technically not needed (we don't export anything), but fixing it anyway...

Change-Id: Ie8017eb1eff427b293c5a993165aa1163e5504df
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-09-13 14:39:37 +02:00
Kai Koehne
2fee7f8105 QmlProfiler: Fix loading failures
The missing dependency to QmlProjectManager caused the plugin not to
load on some combinations (e.g. Windows/Qt5).

Change-Id: I4101e40feaebcb4f71c4e68908f944b583f1c8fa
Task-number: QTCREATORBUG-7869
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-13 12:37:44 +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
Christian Kandeler
753c62d75e Device support: Introduce IDevice helper classes.
These are for configuration of process and ports gathering activities,
respectively.
This couples related functionality more tightly, while keeping
the number of IDevice methods at a reasonable level.
For ports gathering, the patch also adds the ability to configure
both the command and the parsing function; the latter used to be
hardcoded in the PortsGatherer class.

Change-Id: I1b8940397a51efa7ddc05dd15cf861777d118c1a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-02 10:36:04 +02:00
Robert Loehning
ac8150624a Improved translated strings
Change-Id: I92e2a87d063894d4992451ee0e9fe2a99d298eb2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-02 08:52:05 +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
Christian Kandeler
1d85d8e706 ProjectExplorer: Introduce generic application runner.
This class aims to be a flexible worker class for SSH-based
run controls. It supersedes AbstractRemoteLinuxApplicationRunner
as well as all of its derived classes, while having no
RemoteLinux dependencies itself.

Change-Id: If24f03a32126b36fc3d0b253a1615ad0af5f2b46
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-01 11:55:53 +02:00
Konstantin Tokarev
16cf161d82 Changed URL to qt-project.org in pluginspecs.
Also, it's 2012 now.

Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-07-30 07:44:48 +02:00
Friedemann Kleint
bf980649d2 tr()-Fixes for 2.6.
- ProjectExplorer::Profile should appear as 'Target' in the UI.
- Fix messagebox title capitalization
- Fix Q_DECLARE_TR_FUNCTIONS to contain fully qualified class
  names, add where applicable to replace
  QCoreApplication::translate().
- Introduce message utility function for the commonly used
  'No tool chain set up for this profile' message to
  ToolChainProfileInformation.
- Introduce message utility functions related to adding files
  to version control to VcsManager to be shared by QmlJsEditor.
- Fix typos.
- Remove QObject::tr(), QCoreApplication::tr().
- Do not translate diagnostic console warnings of
  QmlProfiler.

Change-Id: I6cee717a504796ef39f6eae58f552c5c8630adf3
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-07-27 17:08:12 +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
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Yuchen Deng
0d20c5b796 Fix qbs code style
Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-06-19 11:22:40 +02:00
Christiaan Janssen
651b9ff65e QmlProfiler: added tooltip for non-optimized bindings
Change-Id: I4500b168c016e7d5525124996be4886e481065d9
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-31 12:30:30 +02:00
Christiaan Janssen
bc9bb6ec69 QmlProfiler: renamed "v4" bindings to "optimized" bindings
Change-Id: I1821b966eeb5068f3f34dbab5ba10f81c8bebd5f
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-31 11:51:58 +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
Christian Kandeler
db0a4d5172 Fix qbs build for qmlprofiler.
Change-Id: I73347b5a7cc3866c7d7df9dec5c835fda8006938
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-22 11:26:12 +02:00
Christiaan Janssen
f1f8706578 QmlProfiler: state dialog as floating widget
Change-Id: I48ff1d729e49347881c82c7bd066d30ecaca47a5
Reviewed-by: Simjees Abraham <simjees.abraham@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-21 12:15:21 +02:00
Christiaan Janssen
4f6cda3ba0 QmlProfiler: added missing break in switch statement
Change-Id: Ia6ca80e494c2bb61749e50be47bff8cf1cdaf108
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-16 12:18:59 +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
Christiaan Janssen
bbbc08a6ea QmlProfiler: reordered tabs
Change-Id: I9c198aef9ab97a8a956280a8637fcb011f10aa6e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:21:43 +02:00
Christiaan Janssen
af72e4bb3f QmlProfiler: show empty trace
In the case that the application did not generate any event
after running the profiler, still show an empty trace.
Otherwise the user will think that the profiler didn't work.

Change-Id: Idd15225270d55d834719f66387864433fcb9026d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:16:12 +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
Kai Koehne
b2a2a7cc18 QmlDebug: Renaming
Move Status enum out of QmlDebugClient and drop "QmlDebug"
prefix for the different 'Reference' structs. Allows to
avoid 'using namespace in QmlDebug' in header files.

Change-Id: Id9857977300e86d637cf128ff3417d8b24c8e995
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 10:33:45 +02:00
Christiaan Janssen
5692c68154 QmlProfiler: printing current profiler state in error message
For debug purposes, facilitates troubleshooting when bugs are spotted.

Change-Id: I6f76d251bc4855f1d1f0ccf4724cd342c39cad29
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 11:23:06 +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
Christiaan Janssen
7f3d93023e QmlProfiler: correctly manage "Application Output" controls
Change-Id: Ief08e953fa38b3eb3d9af8b0e84f793a80931868
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-08 17:26:38 +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
5506d0329f QmlProfiler: Fix crash when loading traces
Don't keep a pointer to elements in QVector (which might get
relocated at any time). Instead, store the index.

Change-Id: If24a408b9f47f0f3a83909ff119867311d87d869
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-05-04 16:24:30 +02:00
Christiaan Janssen
1f4d831f8c Fix: qsTr is a qml method, not a cpp method
Change-Id: Ibe3af962cc7164db0ab54effcd38f4390736950e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-04 16:07:17 +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
Kai Koehne
4d3395b990 QmlDebug: Rename library and (most) classes
Rename the QmlJSDebugClient lib to QmlDebug (shorter names, easier differentiation with the shared/qmljsdebug lib).

Also rename
 - QDeclarativeDebug* classes to QmlDebug*
 - QDeclarativeOutputParser class to QmlOutputParser

To clarify the features,
 - Debugger::QmlDebuggerClient is now Debugger::BaseQmlDebuggerClient
 - QmlEngineDebugClient is now BaseEngineDebugClient
 - QmlDebuggerClient is now QmlEngineDebugClient
 - QDeclarativeEngineDebugClient is now DeclarativeEngineDebugClient

Change-Id: Ie15713730a614c8ab4b637fad0924f95b54e633f
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-18 14:31:36 +02:00
Tobias Hunger
5a01a0c157 Add SymbianIDevice
Change-Id: I0332e6a5e8db6e25a87804c647e920cab537eafe
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-04-17 12:35:37 +02:00
Marco Bubke
89937deba0 Change the toolbar of the debugger sub windows to a flat grey tone
Change-Id: I3f3270fc88b4b3a98d34b70efed4aabc27fe8fcd
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-04-12 15:52:34 +02:00
Joerg Bornemann
96a7fbe3ae qbs files: use Qt5 module dependencies
Renamed gui -> widgets.
Renamed declarative -> quick1.

With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported.

Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-10 18:02:39 +02:00
Christiaan Janssen
6ff4a0b586 QmlProfiler: flush on new trace
Discard pending data if a new trace arrives while an old one
was still being processed.  If we don't, the data of both
traces gets mixed, leading to a possible crash.

Change-Id: Ibba7df06f6a4b7e93d00f6fa1fa4802baf3a1731
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 16:46:41 +02:00
Christiaan Janssen
0009bf8e2b QmlProfiler: fix crash in binding loop detection
The cause of the crash was that animation events are a special case
inside the profile data model, and some parts of the statistics
computation were not taking that circumstance into account.

Change-Id: Ibec929abb18fcdd8af4ddb5ff40b125915746725
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-26 15:30:32 +02:00
Eike Ziller
e5e3f91ed2 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	src/libs/qmljsdebugclient/qmlprofilereventlist.cpp

Change-Id: Ic6251d47ecd032ea1db4fc58dc80e19b6e6cf23d
2012-03-15 15:01:54 +01:00