summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge QML inspector into debugger pluginKai Koehne2012-05-0980-5187/+2669
| | | | | | | | | Merge QmlJSInspector plugin into the debugger. Also merge the extra Inspector window with the Locals & Watchers: It now shows the QML object tree in the running state. Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Device support: Disable some widgets when there are no devices.Christian Kandeler2012-05-092-0/+11
| | | | | Change-Id: I7849054f6a3942bf6d8affdf1cdc5a7d28fb997d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Qt4Nodes: Fix wrong "Parsing in progress" warning for some casesDaniel Teske2012-05-092-39/+60
| | | | | | | | | | | | | | | Removing a subproject and changing the project type of a parent project didn't set always the valid parse state nor emitted the parsing finished signal. Also ensure that removing and then readding a node does update the runconfiguration for that node. Note: The error message is now: "The .pro file %1 could not be parsed", which is better, but can be improved, improving that is QTCREATORBUG-7377 Task-number: QTCREATORBUG-7394 Change-Id: Ie0d9a430ee902bd194179b0512ac8295bc519f2a Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Prevent duplicated project entries on failed project loadingDaniel Teske2012-05-091-1/+4
| | | | | Change-Id: I4505d0957398d47c40843dbcbf8ce25365f6501d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Fix "Projects mode" looking broken if the startup project is "wrong"Daniel Teske2012-05-091-4/+6
| | | | | | | | E.g. this could happen if a session with two projects is opened, where the startup project no longer exists. Change-Id: I1c60bacb62b5f39f7830a3bc30e3aa388a825884 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* QmlProfiler: printing current profiler state in error messageChristiaan Janssen2012-05-091-8/+16
| | | | | | | For debug purposes, facilitates troubleshooting when bugs are spotted. Change-Id: I6f76d251bc4855f1d1f0ccf4724cd342c39cad29 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* QmlProfiler: manage receiving trace after app stoppedChristiaan Janssen2012-05-097-16/+38
| | | | | Change-Id: I97409748ebac3ee8af3690f2d84d3038638a3419 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Device support: Copy device object when adding to device manager.Christian Kandeler2012-05-091-2/+3
| | | | | | | | Otherwise the caller might (inadvertantly) keep a non-const object around and change it behind the device manager's back. Change-Id: I71b3e83e94397416b843006e74dcc1924abed77b Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* QtOutputFormatter: Fix style issuesKai Koehne2012-05-092-20/+19
| | | | | Change-Id: I9f97b5c545639217155fb46dfd32af3b435f00a5 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* OutputFormatter: Make clearLastLine() virtualKai Koehne2012-05-093-4/+14
| | | | | | | | | Make sure subclasses can call clearLastLine() to at the same time remove last line from the editor and QtOutputFormatter, where it is buffered too. Change-Id: I33910943b96d821018e936f72e0c32a96b844e15 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Debugger: Break on raise() -> Break on abort()Orgad Shaneh2012-05-084-12/+12
| | | | | | | | Win64 doesn't seem to have raise() at all, or at least it isn't called on abort() Change-Id: Ief7a97c321db0f91629848852719977d14094173 Reviewed-by: hjk <qthjk@ovi.com>
* fakevim: fix :!cmd if there is no selectionhjk2012-05-081-13/+18
| | | | | Change-Id: Ieafb77ecc4d211f97b7b8321fc84fd7d6c81dfc0 Reviewed-by: hjk <qthjk@ovi.com>
* debugger: make debuggerengine easier accessible to profilinghjk2012-05-081-0/+19
| | | | | Change-Id: I5c9ed1e994e490a6a6859afc6ae1756b09b87af9 Reviewed-by: hjk <qthjk@ovi.com>
* QmlProfiler: correctly manage "Application Output" controlsChristiaan Janssen2012-05-082-8/+10
| | | | | Change-Id: Ief08e953fa38b3eb3d9af8b0e84f793a80931868 Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
* Fix crash on project loading, .end() detachesDaniel Teske2012-05-081-2/+2
| | | | | Change-Id: I6bae9d04b745e27437c43b0bf6f96624be3dfd55 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Qt run configurations: emit enabledChanged if the disable reason changedDaniel Teske2012-05-083-9/+16
| | | | | | | | Otherwise a misparse might get reported as .pro parsing still in progress. Change-Id: I0958032c7692faa4672410f395ededf6f1a2e379 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* ProjectExplorer: Remove hack for virtual foldersDaniel Teske2012-05-087-109/+247
| | | | | | | | | | | | | | | | | | | | | | | | Previously virtual folders, that is the "Sources", "Headers" folders used a hack. This patch removes that hack, by introducing the following changes - The FlatModel and the ProjectExplorer::Nodes now don't require path() to be unique. Thus allowing the virtual folders to all return the same for path(). [1] - Introducing a new node type "VirtualFolder" which is sorted according to a priority. - Introducing a few new virtuals for displayName and toolip(), which can be overriden. [1] Note that all the project managers do require path() to be unique for some types of nodes. That also fixes: Task-number: QTCREATORBUG-7100 Change-Id: I76b730f4c4254e2894467603bbe9a30e356a0bcc Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Squish: Updated object map for changed "Move Component" dialogRobert Loehning2012-05-081-2/+2
| | | | | Change-Id: I63ef64848ff48fd83f7f3f82fc0f088b67147847 Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Fix build: Add missing dependency for resource editor.Christian Kandeler2012-05-081-0/+1
| | | | | Change-Id: Ifde220d33f73501cc05079e30f4610530eb910ab Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix qbs build.Christian Kandeler2012-05-082-2/+3
| | | | | | | | - Bump Creator version. - Add missing dependency to resource editor. Change-Id: I9337d916ec765ad7b299aaa78c24e6c75afd74f5 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* debugger: display references in type columnshjk2012-05-083-10/+10
| | | | | | | | This breaks tradition. Change-Id: I6780f31d584021490293a1ed3a96b5c3608a8a36 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: hjk <qthjk@ovi.com>
* Squish: Update for changed breakPointTreeViewRobert Loehning2012-05-082-4/+4
| | | | | Change-Id: I861585b895f3c3ea0d4ffc324c631e508899f79e Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* Remove unused Node::setPathDaniel Teske2012-05-082-6/+0
| | | | | Change-Id: If01d499ec105968c61f0651a29c5bb94f9f73566 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Make the compile output window use the text editor fontDaniel Teske2012-05-081-0/+13
| | | | | | | | | | This makes the output use a fixed width font by default. Also the application output is also synced to the text edit font Task-number: QTCREATORBUG-7378 Change-Id: Ia036b505017cac0b1254b1b183b798feaee130f9 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Debugger: Catch 'Remote connection closed' in responseKai Koehne2012-05-081-5/+24
| | | | | | | | | 'Remote connection closed' messages sometimes also arrive camuflaged as a response to a command (with the response of the original command already there). Change-Id: I8fa75f561fb341463fc4c0ed0a35aa6fd8300694 Reviewed-by: hjk <qthjk@ovi.com>
* Device support: Fix bug in DeviceManagerModel.Christian Kandeler2012-05-081-1/+4
| | | | | | | | Yet another instance of using a potentially wrong index. Also check some invariants. Change-Id: I2306fe854481e85f38434ec73cf5e92675110bf1 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Device settings widget improvements.Nikolai Kosjar2012-05-081-42/+52
| | | | | | | | | | | - Use a form layout in the "General" group box - now the labels are aligned according to the platform. - Set a minimum height for the "Type Specific" group box. If there are no devices the "Type Specific" label will be not cut off by the underlying spacer. Change-Id: Ia4527628db204ad33852d8d21751ec60cfe225cd Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* debugger: recognize null references explicitly.hjk2012-05-082-0/+35
| | | | | Change-Id: Ie315997363d9f591526ea8c122759f59d808fae5 Reviewed-by: hjk <qthjk@ovi.com>
* Added find support to ResourceEditor.Konstantin Tokarev2012-05-084-0/+9
| | | | | Change-Id: Icf3770fde8329d8507befeeef89186f86476749d Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* use Core::Id for IMode::id and IMode::typehjk2012-05-0831-83/+88
| | | | | Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QtMessageLogView: Optimize performanceAurindam Jana2012-05-085-34/+63
| | | | | | | | | Performance is hit when rendering a large number of messages. Show text contents that fits a line and expands to show the complete text when clicked. Change-Id: I803a8b2da12830172f9e75f86546adf121799a67 Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
* Squish: Marked Qt versions as not autodetectedRobert Loehning2012-05-072-42/+32
| | | | | Change-Id: I073dcc886dd7b05d702eb0968a776d5815f4001d Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
* itaskhandler: interface cleanuphjk2012-05-0714-70/+34
| | | | | Change-Id: Ib85950a4715d6eaf4225bd8dbcc0c2a91b20dc1d Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* FindExportsVisitor: qmlRegisterTypeAurindam Jana2012-05-071-3/+14
| | | | | | | | | qmlRegisterType can also have 2 template arguments i.e. the metaRevisionNumber. Consider the case when parsing exported types. Change-Id: I553f0e361cc9e9c5a88becd50fd72a33cd35a0d1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* QmlJSInterpreter: QML Plugin typesAurindam Jana2012-05-071-35/+26
| | | | | | | | | | A Component in .qmltypes can have an array of exports which may differ in type names and versions. Consider the type names to be aliases and create a CppComponentValue for each of the alias corresponding to the best available version. Change-Id: I759ae0c68441e805b0502bf2d203c524bf1a7a7c Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* Qt4PM: Build current fileOrgad Shaneh2012-05-0710-4/+83
| | | | | | | Task-number: QTCREATORBUG-106 Change-Id: I3511f57b9128073104f6691a469f9c54d64138c3 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Compile fixRobert Loehning2012-05-071-1/+1
| | | | | Change-Id: Ie0bf0937f3d24eddbb31a7b3598529acc4c073cd Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-05-0736-1028/+7120
|\
| * Squish: Fix possible access to NoneChristian Stenger2012-05-071-5/+10
| | | | | | | | | | Change-Id: I4c4a0f211169dad48a4a6b78e4c298b986d07158 Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
| * Restore state of find flags in FindToolWindow.Konstantin Tokarev2012-05-072-4/+12
| | | | | | | | | | | | | | | | | | | | | | There was an issue with checkboxes "Case Sensitive", "Whole Word", and "Regular Expression": their state was properly saved in FindPluginPrivate::m_findFlags, but was not properly restored in GUI of FindToolWindow on the next run of Qt Creator. This patch fixes this issue. Change-Id: I31e1e14a4117fbf4f4d17e82b3fa2b90973be339 Reviewed-by: Konstantin Tokarev <annulen@yandex.ru> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * CDB: Dump Qt 5 / QString correctly.Friedemann Kleint2012-05-071-1/+4
| | | | | | | | | | | | | | Adapt to recent change basing QStringData on QTypedArrayData. Change-Id: I8145015e31ca10bc484d01e8082a2f97d6750285 Reviewed-by: hjk <qthjk@ovi.com>
| * Translate editor display names in correct context.Konstantin Tokarev2012-05-0710-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | These strings were internationalized long ago, but wrong context prevented them from being actually tranlated in GUI. This patch won't break anything - if these strings were not translated for particular language, they stay untranslated, but if they were, translations are used (e.g. for RU). Change-Id: I175e29e8b0cee2bff9306623dad4a5956db69288 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Updated Russian translationSergey Belyashov2012-05-041-1/+1
| | | | | | | | | | Change-Id: I55104beffc6f6c4836ffac1f7d99366439ee0500 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * French translations for 2.5.Pierre Rossi2012-05-041-966/+6733
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the squashed result of work done by the nice folks from developpez.com: Guillaume Belz <guillaume.belz@free.fr> Alexandre Laurent <lw.demoscene@googlemail.com> Full history is available on the team's repository: https://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr/commits/2.5-fr Change-Id: I35283a183402a2cbdbc47ee64a5ecd5ae22e580f Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix what looks like a copy-paste blunder in a Welcome Screen tutorial.Pierre Rossi2012-05-041-1/+1
| | | | | | | | | | Change-Id: I8c574ac464f9e20479be7f5aba0f85e387ea4c3b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Debugger: Show location marker (again)Kai Koehne2012-05-031-0/+1
| | | | | | | | | | | | Change-Id: Ia66e42d90a00ba3ddc6425c0fa5a1d4dc896c545 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
| * Updated Russian translationSergey Belyashov2012-05-031-1/+9
| | | | | | | | | | Change-Id: Ib0a48fc0ff8799fc350bb72886270f5ef0eeadd4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * qbs project: Version bumpOrgad Shaneh2012-05-031-1/+1
| | | | | | | | | | Change-Id: Ic2766f8db298fd2065facfebf0db38ed14938ed6 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Per request, add tool tip to topic chooser items.kh12012-05-031-1/+3
| | | | | | | | | | Change-Id: I35e088e8a6fbd04c23e036b74cd0edb66260e455 Reviewed-by: hjk <qthjk@ovi.com>
| * fakevim: restrict tabstop and shiftwidth spinbox to range 1..80hjk2012-05-031-2/+8
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-7375 Change-Id: Ie6747d9be78a37cb2a0932720506aee26c1e6716 Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
View Lorry Controller Status