summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qbs: correct dependencies (even though they are currently not used)Eike Ziller2014-07-091-2/+2
| | | | | Change-Id: I6f9a6e1e504885f4e69189eb0982e4e04014b1b1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix newline handling in diff editorjkobus2014-07-093-43/+190
| | | | | | Task-number: QTCREATORBUG-12618 Change-Id: If2a30ff4efdc106f43e2ea77d2783ea797e92722 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* EditorManager: Support dropping files on specific splitEike Ziller2014-07-092-1/+17
| | | | | | | | | | It was opening files in whatever split was "active". As a side effect this also fixes dropping files on extra editor windows (which did nothing). Change-Id: I9db9f731eba8718313d3cc43e35609676bcffdc3 Task-number: QTCREATORBUG-9023 Reviewed-by: David Schulz <david.schulz@digia.com>
* Core: Refactor file dropping into reusable componentEike Ziller2014-07-094-60/+99
| | | | | Change-Id: I42d291d8f8c0e76e289e56055044c369e8be8a89 Reviewed-by: David Schulz <david.schulz@digia.com>
* Qbs: Avoid subdirs with ..Eike Ziller2014-07-092-18/+23
| | | | | | | | | | It is not really supported and has subtle issues, which result qmake no longer finding the generated .qmake.cache for Qbs (e.g. when Qt Creator is a subdir of another .pro file). Change-Id: I7a4a1bb6bbde83966daeeccd68165981b6f90e03 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Re-organize GDB option pagehjk2014-07-091-70/+41
| | | | | | | | Move extra dumper file settings to the right, make it a path chooser, simplify code. Change-Id: I9c5bab508949915195ba3bb7515b1632ad98af27 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Beautifier: Fix Qt4 compileChristian Stenger2014-07-091-0/+1
| | | | | Change-Id: I2cb89df7bc7faf41f63fa92f7a3028f392014931 Reviewed-by: David Schulz <david.schulz@digia.com>
* Debugger: Simplify tooltip interfacehjk2014-07-0917-232/+193
| | | | | | Change-Id: I7ce688e56fb516ef6e77ee2e4f56d9b56379918b Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* QMake: Open .qmake.cache .stash and .conf in pro file editorEike Ziller2014-07-093-0/+21
| | | | | | | Change-Id: I8b0eebd20962b5f1d527e5fcb50d0781d76617e8 Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner: Test if creator can connect to the puppetMarco Bubke2014-07-091-17/+41
| | | | | | Task-number: QTCREATORBUG-12612 Change-Id: I44ea38fafb1835be159ca4b757cb4d3d662aa8c5 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlProfiler: Clean up assignment of initial details to eventsUlf Hermann2014-07-091-16/+9
| | | | | | | | | | - Build the displayname from the location only once per event - Make sure Qt4 paint events show the "GUI Thread" label - Remove useless "Animations" displayName. It isn't shown anywhere. Task-number: QTCREATORBUG-12496 Change-Id: I823676499670fc019b5dbf225668f833d17076b8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProfiler: Remove dead code from trace file writerUlf Hermann2014-07-092-39/+0
| | | | | | | | | | | | | | The whitelisting doesn't actually do anything useful. The trace writer uses a generic method to save range events and only needs specific code for non-ranges. The compile time checks for the sizes of MESSAGE_STRINGS and RANGE_TYPE_STRINGS make sure that you can't accidentally leave some event type unimplemented. The calculation of measured times is obsolete, too, as the only code the trace writer is called from also sets the trace time. Change-Id: Id431630114cb0a0247b774f10874c5caff761436 Task-number: QTCREATORBUG-12496 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProfiler: Fix logic when selecting previous eventUlf Hermann2014-07-091-1/+1
| | | | | | | | Events should be walked in the order of their start time, not end time. Change-Id: Id9f9746958dbfbdc28424c34b3ca1f5e4b9ff373 Task-number: QTCREATORBUG-12634 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QmlProfiler: make sure indices in SortedTimelineModel are correctUlf Hermann2014-07-092-1/+18
| | | | | | | | | In the rare case that a new item is not appended but inserted in the middle of already existing data, the end times were confused. On that occasion, also add a note explaining how the indices work, Change-Id: I587b8285cd5482a9ffb1592302b442192e5944b8 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Debugger: Move string size settings to L&E pagehjk2014-07-091-46/+39
| | | | | | | They belong there conceptionally, and there's more space. Change-Id: I5167ed3713266af866aebff00eec848f74b4c2b9 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Fix tooltip expansion behaviorhjk2014-07-093-5/+33
| | | | | | Task-number: QTCREATORBUG-11404 Change-Id: I7e08cd6b8216ff7dd0069c2a8718f6bb619ede07 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Beautifier: Format current file asynchronousLorenz Haas2014-07-098-34/+142
| | | | | | | The formatting tool is now called asynchronous. Change-Id: I0415611655a584ba0275f4bccd065ea1182f83dc Reviewed-by: David Schulz <david.schulz@digia.com>
* A bit more status output for the source package creation scriptEike Ziller2014-07-091-0/+1
| | | | | Change-Id: I35c89cbf3c59972fcec3377fceb0ef688d6779e4 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qmldesigner: use document specific import pathsFawzi Mohamed2014-07-082-8/+10
| | | | | Change-Id: I079e843d67cd177db049b299a6e34715d08e845e Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Remove duplicate codeYuchen Deng2014-07-081-1/+0
| | | | | Change-Id: Iadc76feaca0f9f3ea1ed49a64948ed785ba43ca8 Reviewed-by: hjk <hjk121@nokiamail.com>
* Debugger: Use a history completer for watched expressionshjk2014-07-081-6/+76
| | | | | | | Some of them can be laborous to retype, so keep some history. Change-Id: Ibc12077f77fc5acc901c95001fb95bfb89763758 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* QmlDesigner: Don't show QtQuick import pathsMarco Bubke2014-07-081-1/+2
| | | | | Change-Id: I2789d50d0b8ce6025317b1976c87229534998a8b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Use async warningMarco Bubke2014-07-081-2/+2
| | | | | Change-Id: Ie158ea479b60394841f31b1cee72fd89f1e1ca35 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Don't add imports manuallyMarco Bubke2014-07-081-5/+0
| | | | | | | | | Add Quick 1 or 2 imports to projects which are not using them can be potentially harmful. Change-Id: Idb4a9e1f4cd34fdb5d0e0200bc68fed334c2f80c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com> Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* QmlDesigner: Don't show private importsMarco Bubke2014-07-081-20/+47
| | | | | | | And refactor TextToModelMerger::setupPossibleImports Change-Id: Ia0f1402dda59c3b5ba55adac12011251356417b2 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Version bumpEike Ziller2014-07-082-4/+4
| | | | | Change-Id: Iceded20db5c4d18b3ae075f99faacb351967277c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* TaskListPlugin: Adjust after changes to IDocumentFactoryhjk2014-07-088-165/+66
| | | | | Change-Id: I5c7256b581bb10ecaf9d3cd3b78b8d45dc60132b Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SdkTool: Use Qt Creator doctypesOrgad Shaneh2014-07-0812-38/+40
| | | | | | | Simplify filename conversion while at it Change-Id: I0a7473aa42626a04214887f1cc82abe536233a78 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* SdkTool: Support adding kit for desktop deviceOrgad Shaneh2014-07-081-0/+4
| | | | | Change-Id: Ibaba86dd72655ec3734a7564ae9eec6c3c85df1f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* More change logEike Ziller2014-07-081-7/+129
| | | | | Change-Id: Ic8309c7c92a380876d337ba9a2d98d074fa8280a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Mark app.pro as QTC_RUNNABLEDaniel Teske2014-07-081-0/+1
| | | | | Change-Id: I8549e00a6360504fad2a93e3b862ecc8cd909c2a Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Remove direct entering new watchers in the treeviewhjk2014-07-084-26/+22
| | | | | | | | | Instead pop up the "Add new expression dialog". Same amount of activity needed, but more uniform in UI and code and hopefully less confusion about the now-gone <Edit> marker. Change-Id: I228801dc51f6d09ea9991b98399dc9ef04aa96c8 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* CppTools: Remove a QTC_ASSERTNikolai Kosjar2014-07-081-1/+2
| | | | | | | | | | | | Triggering the action "Rename Symbol Under Cursor" before the SnapshotUpdater::update() call in parse() of cpptoolseditorsupport.cpp led to the failing assertion. Triggering the action in the initialization phase of the editor is not supported, therefore replace the assert with a silent if. Change-Id: Ib911b8aa038ae3d9ea28c720853780b11dfa0fb7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* HistoryCompleter: Fix current text() handlinghjk2014-07-084-23/+29
| | | | | | | | | Can be seen in the Debugger's "Command:" input: Selecting a history entry with "Return" properly executes the selected item, but put something else into the line edit. Change-Id: I2efa05374d9c31e8a80219794f2dbaaf50a01f9b Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Bookmark: Consolidate data handlinghjk2014-07-084-60/+25
| | | | | | | | Avoid storing of copies of the same information. This still calls saveBookmarks() too often needlessly. Change-Id: I2c9a67252ea444a722802a6dd4b1e8d154d1c82c Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: Fix compact display of individual hash nodeshjk2014-07-082-8/+18
| | | | | | | | | This was not accessible if the hash itself was a typedef. Also, make sure that unusual key contents don't do any harm in the protocol by hexencoding it unconditionally. Change-Id: I83d43768ec72f797a72b2d9c44ca91b1feaf61a7 Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* C++: template base class and default argument for template classPrzemyslaw Gorszkowski2014-07-082-5/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix code completion for case: struct Foo { int bar; }; template <typename T> struct Base { T t; }; template <typename T1 = Foo> struct Derived : Base<T1> {}; int main() { Derived<> foo; foo.t.// no code completion return 0; } Task-number: QTCREATORBUG-12606 Change-Id: Iadf2fae172739d0a5844c6b437fd2686616e64e7 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* qmljs: avoid adding the full path without required pathFawzi Mohamed2014-07-071-2/+2
| | | | | | | | full path imports of modules did not have a required path (not even /), so did show up with any import paths. Change-Id: I494edc50339f0c707499b13f6c16c2a264cbaa79 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Version bumpv3.2.0-beta1Eike Ziller2014-07-072-4/+4
| | | | | Change-Id: Id327afba79a865cf64b64fd817efe5c8b8797043 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner: Use -j X only for makeMarco Bubke2014-07-071-1/+1
| | | | | Change-Id: I548defae5b0f6231916964955cc0ec19424dc20a Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: fix using the right object/unitTim Jenssen2014-07-075-21/+28
| | | | | | | | | | TreeViewStyle is existing two times and wasn't in anonymous namespace. The result after refactoring was that the wrong TreeViewStyle was used. Moved the two times existing drawSelectionBackground to NavigatorTreeView to avoid similar problems. Change-Id: Id87894a01b5f6c94c81c478f9492ec6b78eb9e70 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Revert "QmlDesigner: Use QQuickWidget in the item library"Marco Bubke2014-07-072-17/+16
| | | | | | | | | This reverts commit 8dfb05c8463282590d29534933a25d9ab529efa4. Because we get crashes with QQuickWidget. Change-Id: I7a60c139df3cccb9498d0750e4f40c60faf31509 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Revert "QmlDesigner: Using QQuickWidget in the Property Editor"Marco Bubke2014-07-072-4/+100
| | | | | | | | | This reverts commit eb5edae8ebee02ce896aab47f44f53721e793c3e. Because we get crashes with QQuickWidget Change-Id: I63546f4c59e382019cb8524e32071dc9ad8fd171 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* Revert "QmlDesigner: Use QQuickWidget in states editor"Marco Bubke2014-07-073-25/+33
| | | | | | | | | This reverts commit 7d43664958a3080af3033564ad91f7691fd2f7a9. Because we get crashes for QQuickWidget Change-Id: Id3ff197bf5452abefad07dbadb4f7a509f117dfb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Fix compile linesMarco Bubke2014-07-071-1/+1
| | | | | Change-Id: Ib7b344a11ddcceb5822676cf0bee1e01d9122a2b Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Improve speed of puppet compilingMarco Bubke2014-07-071-1/+16
| | | | | Change-Id: Ic6e73e5ec285b3ff77976e3e3b295ec6a31b3ceb Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Using separate channels for puppet creationMarco Bubke2014-07-071-1/+1
| | | | | | | We want only count the compiler commands to get a reliable progress bar. Change-Id: I99ce26cba857bdd143892d9e9e6d86b7278d63f9 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Slow down the preview timerMarco Bubke2014-07-071-0/+2
| | | | | | | The painting is slowing down the form editor. Change-Id: I71afbefff353d23bd25fb9877ee70b896b73b378 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Don't restart the puppet with debugger attachedMarco Bubke2014-07-071-3/+5
| | | | | | | The debugger is stopping the alive commands so the puppet is restarted. Change-Id: I80e8f0ea4d47dd49e15f41471410dded33355579 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
* QmlDesigner: Improve style of states editorMarco Bubke2014-07-072-27/+7
| | | | | Change-Id: Icbe8a6cb4713ec23bd7eb8ed7e9bec862822716c Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
View Lorry Controller Status