summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Move IEditor::createNew to IDocument::setContentsEike Ziller2013-07-1742-191/+194
| | | | | | | | | The method is for setting the contents, so it belongs to the document, and should be named correspondingly. Change-Id: I40363dc08f11268f530885b512e4a88e8b10d096 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* QmlDesigner: Prefix for puppet outputMarco Bubke2013-07-162-6/+46
| | | | | Change-Id: If149ddb26e0e9852b6970ecac6f535499ea7b3af Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* QmlDesigner: Add hasValidMetaInfo to ModelNodeMarco Bubke2013-07-162-0/+11
| | | | | Change-Id: Ifb00ad28dc72d4876b9dffbad70b18d6ada07004 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Remove CodePaster protocol.Friedemann Kleint2013-07-167-465/+0
| | | | | | Change-Id: Iad4455ba80f374968e16d5d4eeb256a7b6883552 Reviewed-by: Robert Loehning <robert.loehning@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Fix marking JavaScript lines that threw an exceptionEike Ziller2013-07-163-34/+36
| | | | | | | | | Since EditorManager::openedEditors doesn't exactly do what one would expect, it was only marking a single editor even if there were multiple editors on the same document. Change-Id: Iae579c2cfd8455de2783d39fa69944fe92dfc60a Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* QML Designer: Fix message about puppet crash.Friedemann Kleint2013-07-161-2/+2
| | | | | Change-Id: I604cdbd2abfd45105502e19d80f102df1017f4c5 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.DocumentManager: exporting DocumentManagerThomas Hartmann2013-07-161-1/+1
| | | | | Change-Id: I7cd020b35b95300007e9ec9c7a3bd41a59481f88 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.CrumbleBar: code cleanupThomas Hartmann2013-07-161-2/+0
| | | | | Change-Id: I20e2002c7b2ccc25d8120222fa9b52e59db498ee Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.DesignDocument: code cleanupThomas Hartmann2013-07-161-2/+0
| | | | | Change-Id: Ib71117cb5726662b4212f99a7c4136005273ae66 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.DesignDocument: getting rid of the magical StackedWidgetThomas Hartmann2013-07-162-4/+0
| | | | | | | | This StackedWidget is a leftover from the stand alone version. In the context of Qt Creator this makes no sense anymore. Change-Id: I6660dd4b43bdc12fa3329d333158fa759bee4d88 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Model.Rewriter: crash fixThomas Hartmann2013-07-161-2/+4
| | | | | | | No TextModifer might be attached. Change-Id: Ia06a1844ebf10392de1edb8cdb25d70bfa31e14d Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner.Model: Allowing the model to hold a TextModiferThomas Hartmann2013-07-164-0/+19
| | | | | | | | | | | | We have a one to one relationship between models and TextModifiers. With this patch the model keeps track of its own TextModifer and does set it to the rewriter if attached. The model does not take ownership, since it does also not take ownership of its views. Change-Id: Ied02666debf6aad76666b0d9d22e8ba2f72be666 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* QmlDesigner: DesignDocument removing m_currentModelThomas Hartmann2013-07-162-27/+33
| | | | | | | | | | | We remove m_currentModel and replace it by currentModel(). If m_inFileComponentModel is nil the current model is the document model, otherwise the current model is the inFileComponentModel. No need to keep m_currentModel around explicitly. Change-Id: I590e02dc03c2319cbf713b880cf43d740d64e942 Reviewed-by: Marco Bubke <marco.bubke@digia.com>
* Fix crash when loading ui file that uses resource filesEike Ziller2013-07-162-2/+2
| | | | | | | | | | | | | | Crash introduced with recent refactoring 113c5600c909791ddfea3d424a41d982dcdda6b7 Use the IDocument::filePathChanged signal (instead of changed() which also fires when modification flag changes) to detect that a ui file might be in a different project or no project now, and available resource files changed. Task-number: QTCREATORBUG-9813 Change-Id: I9b9e26be916ffe7bbf3ab49d934d0e4c111e48df Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Designer: Remove some redirections.Eike Ziller2013-07-1610-101/+72
| | | | | | | | | | Instead of keeping a separate plain text editor and document, the FormWindowEditor and FormWindowFile are directly derived from PlainTextEditor and BaseTextDocument respectively. Change-Id: I4319904dea769ec31900061bc7c3a3c5c22e0e8a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Android: Fix capitalization in message.Friedemann Kleint2013-07-161-1/+1
| | | | | Change-Id: I8ec555982b9b8b6f30e32e20307c7c440b07a2a8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: Fix names of functions dealing with enclosing scopesNikolai Kosjar2013-07-161-1/+1
| | | | | | | | | | | | ...in order to better tell apart the type related functions isScope()/asScope() and the functions dealing with enclosing scopes: * scope() --> enclosingScope() * setScope() --> setEnclosingScope() * resetScope() --> resetEnclosingScope() Change-Id: Id743a7d1b6a1a1a0ffcd8568cbd8ebbdfc16eaa1 Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
* Make SubmitEditorFile dependency on VcsBaseSubmitEditor explicitEike Ziller2013-07-154-27/+27
| | | | | | | No use trying to hide it. Change-Id: Id81fdf1eef704dec6d4e83ee69bec10b1244b202 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* tr()-fixes in git.Friedemann Kleint2013-07-152-11/+16
| | | | | | | | | - Do concatenate message pieces that may not fit grammatically. - Common message for "Cannot launch". - Add period marker. Change-Id: Ic67b27e30143febebc9153a3cefe523ebfd4bc49 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* EditorManager: Remove unneeded methodsEike Ziller2013-07-153-24/+7
| | | | | Change-Id: If3ab9414270df33fb6b0e269b628813e4c71e5c8 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* PushToGerrit: Filter out stale branchesOrgad Shaneh2013-07-124-17/+40
| | | | | | Change-Id: Ib4f1d7ead2c40f27be28fa45e042c3694c0444fd Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
* Move IEditor::isTemporary to IDocumentEike Ziller2013-07-1238-89/+58
| | | | | | | | | It's a property of the document implementation, not of the specific editor instance working on it. Change-Id: I5c3dd054e21b646e2d94b891916a096d045923f8 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* C++: fix local types and membersPrzemyslaw Gorszkowski2013-07-122-0/+209
| | | | | | | | | | | | | | | | | | | | It fixes code model when we have local type which contains a member of other type, e.g.: struct OtherType { int otherTypeMember; }; void foo() { struct LocalType { int localTypeMember; OtherType ot; }; LocalType lt; lt.ot.//no code completion } Change-Id: I018f492a6c48bfcbba0ef376ef005825e2b13f35 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* CppEditor tests: work on documents instead of editorsEike Ziller2013-07-121-13/+12
| | | | | Change-Id: I27964a585996f9838a87856fd68067ce29ce755a Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* QtSupport: Fix qbs build.Christian Kandeler2013-07-121-2/+2
| | | | | | | Was broken by 81eba6f9843179804ed2e53d490e718b12c04044. Change-Id: If85dda7384ecfb174cc8388e919336ea34c1c41a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Debugger: Add button to debug python dumpershjk2013-07-122-3/+27
| | | | | | | | This searches the last 'bb' command and triggers a re-run with the 'pe' option added. Change-Id: Icbe251c9f8980f3bcd0ba10171ec39f0fb02c2f4 Reviewed-by: hjk <hjk121@nokiamail.com>
* C++: code completion for lambda callsPrzemyslaw Gorszkowski2013-07-122-0/+142
| | | | | | | | | | | | | | support for lambdas, e.g.: struct S { int bar; }; []() { return new S; } ()->bar; [] { return new S; } ()->bar; []() ->S* { return new S(); } ()->bar; []() throw() { return new S(); } ()->bar; []() throw()->S* { return new S(); } ()->bar; Task-number: QTCREATORBUG-9523 Change-Id: I43fbf6f0ee0bb11411c53c984df75ef33a276466 Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
* Wizards.Dialog: fix the All Templates caseThomas Hartmann2013-07-121-29/+21
| | | | | | | | | | | | | | | | The "All Templates" case in the comobox did not work as expected from users. It still did only show wizards we have a kit installed for and it was not available for the case of one platform. The semantics for "All Templates" were actually "All available Platforms". This was confusing especially in the case of no platform. Now "All Templates" does show all templates, but the wizard give an error message, if no corresponding kit is available. Task-number: QTCREATORBUG-9792 Change-Id: Ia83a0577bde7e726b2638868bcaffbe13499f2f7 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Debugger: give the qmlToolBar a parent.Erik Verbruggen2013-07-121-1/+1
| | | | | | | Showed up in valgrind as a leak, when QML debugging was not used. Change-Id: I8e378795727f0e2f297086ae73dab99b6a28de32 Reviewed-by: hjk <hjk121@nokiamail.com>
* FindInOpenFiles: use documentCount instead of openedEditorsEike Ziller2013-07-121-1/+1
| | | | | Change-Id: I329417ce61b71f3bf080c5a76c41c69acda2cb94 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Don't use openedEditors in CMakeProjectEike Ziller2013-07-121-3/+3
| | | | | | | Work on documents instead. Change-Id: I7000d10b2a885d5dc22c9b40377c9521f21b6195 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Work with documents instead of editors where possible in debuggerEike Ziller2013-07-129-77/+58
| | | | | | | | | And where using editors is necessary, take *all* editors into account, not a random set of what previously was called "original" editors (when using splits). Change-Id: Id6bbad08f3083b6744fc2edcf0b87ba504d3257b Reviewed-by: hjk <hjk121@nokiamail.com>
* Make document model static and add some document related methodsEike Ziller2013-07-1225-112/+121
| | | | | Change-Id: Ibcb863e67a2433529c9d2b6dec237f9d8b1d8d50 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* OpenEditorsModel API: Use 'document' more where is about documents.Eike Ziller2013-07-1217-145/+144
| | | | | | | | | | | Rename OpenEditorsModel to DocumentModel. In the DocumentModel also make the distinction between "restored" document (i.e. just info about file name, display name, id), "opened document" (i.e. document with IEditor and IDocument), and "document" (which refers to any). Change-Id: I01ebe10ec84aab5fe81e54be6bec14f653f28771 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Editors: Fix leaking entries.Eike Ziller2013-07-122-26/+31
| | | | | Change-Id: Ic05f0acd61c73a92dc0ee6861be4993557242986 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.8'Eike Ziller2013-07-124-6/+14
|\ | | | | | | | | | | | | | | Conflicts: qtcreator.pri qtcreator.qbs Change-Id: I1310d473584f1e2cd44008d45747c868103bbde1
| * MakeParser: Do not show "Warning" as errorOrgad Shaneh2013-07-111-1/+1
| | | | | | | | | | Change-Id: I61e6dd689d8f24402f6ac5bb0fb109ecc1a26831 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * Git: Prevent double stash pop on branch checkoutOrgad Shaneh2013-07-111-1/+1
| | | | | | | | | | | | | | | | when Move Local Changes is selected Change-Id: I2c52e7fde56020370251c6eb93ed3f342fb8d9d8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
| * VCS: Stop on file pattern when building a chunkOrgad Shaneh2013-07-111-1/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-9782 Change-Id: I0e50c5c2696ad9cfe4e8a56c28cb17a2ee039b4f Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
| * QmlConsole: Check for duplicate childrenAurindam Jana2013-07-111-1/+7
| | | | | | | | | | | | | | | | | | When constructing the console item tree, check for duplicate entries. Change-Id: Ibc5aa150287ef5e2ee4b691a71bb170308a1fde7 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
| * QmlConsole: Fix infinite recursion bugAurindam Jana2013-07-111-2/+4
| | | | | | | | | | | | | | | | | | | | | | The queried v8 object sometimes returns a child item that refers to itself triggering an infinite recursion. Task-number: QTCREATORBUG-9747 Change-Id: I30dfbb834ebeb39c33a6050d4b4860b1b47f34d9 Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Editors: Get rid of keeping separate lists of "duplicated" editors.Eike Ziller2013-07-128-301/+214
| | | | | | | | | | | | | | | | And use documents for the list of currently open documents, instead of using a set of "original" editors that needed to be separately managed. Change-Id: I3379ca44f03646399d3ecb0e775d7f1fd81a6bcf Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Utils: Rename winQPidToPid to qPidToPidhjk2013-07-123-19/+5
| | | | | | | | | | | | | | ... and make it a no-op on non-Windows. Saves #ifdefs. Change-Id: Ie791f7b9f1a425325d0b889e73758c5f7f7e6ad2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Valgrind: Compile on Windows.Friedemann Kleint2013-07-121-1/+2
| | | | | | | | | | Change-Id: I3afd64b297a15af2e51c7fdd83292b9ca2a1cc1f Reviewed-by: hjk <hjk121@nokiamail.com>
* | Git: Refresh configuration widget if editor is foundOrgad Shaneh2013-07-111-12/+26
| | | | | | | | | | | | Task-number: QTCREATORBUG-9783 Change-Id: Id1092fb9a79dfbf0425be4913241a507afb56a85 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Git: Remove args from diffOrgad Shaneh2013-07-113-19/+16
| | | | | | | | | | | | | | They are unused Change-Id: I6cff3c6028208f1c7c0937c53b3f5090dae719a6 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Analyzer: Merge Valgrind process classeshjk2013-07-114-321/+214
| | | | | | | | | | Change-Id: Ic2ef2304fb5524d07858052806124f6b02ca4dcb Reviewed-by: hjk <hjk121@nokiamail.com>
* | Memcheck: Merge part of local and remote code pathhjk2013-07-111-45/+28
| | | | | | | | | | Change-Id: I683cedbe5fbed6d10b24100c51f77a75f74504a1 Reviewed-by: hjk <hjk121@nokiamail.com>
* | QtVersion: Allow the user to rename autodetected qt versionsDaniel Teske2013-07-112-1/+2
| | | | | | | | | | | | Task-number: QTCREATORBUG-9787 Change-Id: Id6fc29ea5466c76ffd8f2cddc2cc7583395b9ba3 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix warning in taskmodelTobias Hunger2013-07-111-1/+1
| | | | | | | | | | Change-Id: Ie1c0c7112c2de7af51fb96415155b3b723a488a8 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
View Lorry Controller Status