Commit Graph

30676 Commits

Author SHA1 Message Date
Erik Verbruggen
23085895d6 C++: handle @try statements in the parser.
No semantic analysis yet, but this prevents the parser from generating
bogus diagnostics.

Task-number: QTCREATORBUG-9309
Change-Id: I2ec575a8474cd51bfa97b17678d3da71ab8dcd7a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-19 14:49:38 +02:00
Nikita Baryshnikov
61367fc6ab Git: fix crash in branches dialog
When tags are not shown in branches dialog, selecting of any item in
branches list causes crash

Change-Id: I8bfb66202f486c175a14c59f17b43df21ff596ff
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-19 14:21:13 +02:00
Eike Ziller
745f82bfc6 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: I59ce346c85803f5496a22bdadf7dca09e59d3174
2013-07-19 14:17:43 +02:00
Eike Ziller
56bdad140c Fix crash with splitting and non-splittable editors
We may not just add an editor to a view without removing it from the
original view.

Task-number: QTCREATORBUG-9843
Change-Id: I1041ceb1f063bb627b5f0bd16bc3b2973a4dc3b6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-19 14:14:56 +02:00
Orgad Shaneh
360366ae08 VCS: Remove unused termination mode
Defaults to NoReport and nobody sets other values

Change-Id: I3def23bd350fcef45df9eb8d3a0e86baac192bd9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 13:56:41 +02:00
Orgad Shaneh
0c50c5a1d3 VCS: Consolidate codec handling
Change-Id: I2c9a5031b63f0bc3e884739be680d051d7cf1ab4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 13:56:34 +02:00
Christian Kandeler
a1e9b81cec Device support: Rename DeviceManager::deviceListChanged().
The name is misleading: A "change" could also mean a device was added or
removed, which is not what his signal tracks. The new name is
"deviceListReplaced", which should give a better hint.
In addition, add an explanatory comment.

Change-Id: I0a67c4caf20520df53f2d046905b7ac8da4c2972
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 13:53:51 +02:00
Orgad Shaneh
794ea51447 LdParser: Do not consider "first defined here" as an error
Change-Id: I01b27cd12776e22a5b52ceae4c89a4cd567c69ed
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 13:03:35 +02:00
Orgad Shaneh
9744c54580 Add soft assertions for regexp patterns
Change-Id: If0072f8f9761bdc34b35d01aac4d00c5391b8a20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 13:01:20 +02:00
Orgad Shaneh
a27b0907ee LdParser: Fix position regexp
Position is always followed by colon, not only for .text/.data

Change-Id: I7790c5704423aa57f9752fce1021f67319c58df8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-19 12:59:35 +02:00
Nikita Baryshnikov
56d3be8c0b DiffEditor: fix crash on diff action
Fix crash in GitClient::findExistingOrOpenNewDiffEditor as new DiffEditor
is not created

Change-Id: I7f0cd18ff3acffe1d83a5fad4d6f0df8c4d133f3
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-19 12:14:34 +02:00
Aurindam Jana
885520d954 RemoteLinuxAnalyzeSupport: Fix empty remote command line to device
Currently only QML profiling is supported. Pass the remote command
along with -qmljsdebugger argument to device.

Change-Id: Ia64396f9c6da80e70cb1ee624ed974f8cc32465f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-19 10:57:06 +02:00
Petar Perisin
a766fc42bb Git - allow stash-only in stashPrompt
Change-Id: I5e81bd3dfc8986c7492701ac5ce5537e0d591834
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-19 10:33:58 +02:00
Orgad Shaneh
b6fb9e3e54 VCS: Support silent output on runVcs
Change-Id: If737b03f9d090076e9d739189479fb6725ae8856
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 17:16:30 +02:00
Orgad Shaneh
93dd2795ba VCS: Use source() for file path where applicable
Task-number: QTCREATORBUG-9834

Change-Id: I5ee84593c56a0e3beaf20ef643b04d4de40c37f3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 17:15:42 +02:00
Orgad Shaneh
173da5f45b Git: Set diff base directory for log
Log can also contain diff, base directory is required for correct
apply/revert actions

Change-Id: I9540fc75b1e008a1c8433f121b184f164172a1cb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 16:59:42 +02:00
Erik Verbruggen
1478e661ed Introduced mime-type for ObjC++.
Updated/fixed the code to treat treat text/x-objcsrc and
text/x-objc++src correctly.

Change-Id: I1ab97577c786a28381398e4e0fac177325d00d7b
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-18 16:45:27 +02:00
Christian Kandeler
4ec63a7152 QML debugger: Fix remote debugging with port forwarding involved.
Full explanation inside.

Change-Id: Ib39f18282b7d78ebdab53ac2ebe9d4cf1e11c008
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-07-18 16:22:59 +02:00
Robert Loehning
732f8a06ae Squish: Update for changed window title in Creator 3.0
Change-Id: I669e4822ea99bab22afe229d8dc822bc7ffc4550
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-18 16:10:23 +02:00
Tobias Hunger
f17bdffb11 Qbs: Let plugins extend the profiles written into qbs.conf
Provide a way for plugins to extend the profiles that Creator
will write into the Qbs configuration.

This should allow e.g. the Android plugin to add customized settings.

Change-Id: I0de596e2c922280b953c43ea0651b08b8936234c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-07-18 14:51:44 +02:00
Eike Ziller
8c2e3fd2cb Fix usage of EditorManager::editorsForFileName
And move to using the corresponding method in document model.

Change-Id: I80b12ceab8a91c5393b9c0422d660a8896ae09d8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 14:51:39 +02:00
Eike Ziller
bc88c0b89e VCS: Use documents instead of editors a bit more.
This patch mostly gets rid of EditorManager::openedEditors usage. The
VCS editors should have a better widget<>document separation, also to
make it possible to split/duplicate them, but that's for another time.

Change-Id: Idd92a6a4884ff69fba4f4793d182aa7ff68d79e4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-18 14:51:03 +02:00
Simon Hausmann
c97e894a24 Fix build with Qt dev (5.2)
QVariant now has an operator< that is ambiguous with this one.
(since commit 7ed15da3c1b9e2bb26f414a10bfc6e6d79d7cc7b in qtbase)

Change-Id: Idf38afe85cec966df1885aa2da0f37fbb3eeccf6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-18 14:40:03 +02:00
Orgad Shaneh
268a5f7a2a BinEditor: Remove unused include
Change-Id: I222be2e40547bf9153cee93f2179d0bd1dd88aca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-18 14:24:30 +02:00
Eike Ziller
db2977531b QmlLivePreview: Don't use EditorManager::openedEditors.
It doesn't do what one'd think it should, and will be removed.

Change-Id: I5f496388854913d1b968a5e0ffe6eaa5ca1430f0
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2013-07-18 13:37:36 +02:00
Eike Ziller
5563604876 Merge remote-tracking branch 'origin/2.8' into HEAD 2013-07-18 11:54:02 +02:00
Eike Ziller
7b4895d7ec Remove TextEditor::RefactoringChanges::editorForFile
This also fixes a bug with setting text cursor in InsertDefOperation in
case of split editors (where the cursor could be set in a non-active
editor on the target file).

Change-Id: I1c011386537bc88a89d4d66bec79dfe06faac3c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-18 11:50:11 +02:00
Leena Miettinen
35211c04b1 Doc: move docs from h files to cpp files
QDoc does not look for docs in header files.

Change-Id: I4530233d647fdc2f5ca44c73aee7e0125df07979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-18 10:25:28 +02:00
Eike Ziller
e782e72341 Add some useful methods to document model.
Change-Id: I3082ec561fad7740600caaa959824387a7e9e2fb
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-18 09:41:31 +02:00
Orgad Shaneh
f029712352 Qbs: Fix install path for styleplugin on Windows
Change-Id: Ic3743df91ac48969c751ebbe78c62adb5b4850bb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-17 16:41:52 +02:00
Eike Ziller
4b6de71fd0 Fix issues with having same document open in multiple splits
Sometimes one split would not show the document even though it shows in
the combo box.

Task-number: QTCREATORBUG-9801
Task-number: QTCREATORBUG-9798
Change-Id: Iea79c6f3deb4f1570685794c6eb762f603a36b5f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 16:27:02 +02:00
Robert Loehning
ec6be6640a Squish: Test "Go to slot" in Widget Designer
Change-Id: Idc4517f86035aa5faa1265f275b0ed5f97526d2f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-07-17 16:21:43 +02:00
Leena Miettinen
a5dccb1736 Doc: import statements go to QML files, not pro files
Change-Id: Ia36ffd51add0c92b396e448d8e125848e9754877
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-07-17 15:32:16 +02:00
Nikolai Kosjar
c84e3a27d6 CppTools: Garbage collect if the last CppEditor is closed
Task-number: QTCREATORBUG-9828

Change-Id: Ie0ef9757cedb772702e49542b58d5b589506aa9e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-17 14:54:10 +02:00
Nikolai Kosjar
bc4fa63f84 CppTools: Move GC() call from CppEditorWidget to CppModelManager
There is no need to have that logic in CppEditorWidget. The
CppModelManager knows how many editors are open and can therefore call
GC() by itself.

Change-Id: I2ed4051ad7b8c87615014d73e29291027d49d2ab
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-17 14:54:01 +02:00
Erik Verbruggen
0e62487fb3 Git: fix compilation failure in Qt4 specific code.
Caused by 762099487c where a memory pool
was introduced to fix memory leakage.

Change-Id: Ib2f7c53e9560ff473fcdfedd6dcfce50455095da
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-07-17 14:31:46 +02:00
Eike Ziller
76a3007eeb Compile ClearCase plugin on Mac but keep it disabled.
Change-Id: I43f09324ad2502a64bb51c4b6cde337ebbe18132
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-07-17 14:05:45 +02:00
Erik Verbruggen
762099487c QML: add a memory pool to the Json* classes.
The memory pool is not too efficient, but will keep objects from
leaking.

Change-Id: I68a55bc7a6ea56463652245abeea8954b693c1d7
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-07-17 12:46:10 +02:00
Eike Ziller
7702ad52ce Project editor settings: apply to all editors
It was only applying the settings to one of the open editors in case of
splits.

Task-number: QTCREATORBUG-9825
Change-Id: Iaa9b92d33f2531e7c5d053270f354f052160acd8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 12:23:55 +02:00
Eike Ziller
890bb77f82 Update the Qml working copy from the documents, not editors.
Unfortunately the language is still checked by using an editor property.

Change-Id: I3b54624e60b65c48b154c405f66d04b74be5be3e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-17 12:09:05 +02:00
Nikita Baryshnikov
a6eefb1ae0 Mercurial: Run update after pull
Get output of pull command and emit signal if update/merge is needed. On
update show update dialog.

Change-Id: I814f76daf3d89d0bd9485ed42a224b6b5d78bcb3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-17 11:49:28 +02:00
Nikita Baryshnikov
ee266048f6 Cmake: Added cmake errors parser
Added cmake errors parser

Change-Id: I137f62111861c7e72d84e44b5ab631b9f60c2834
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-17 11:49:09 +02:00
Orgad Shaneh
ad9e7ccab6 Fix coding style for else statements
Change-Id: I1309db70e98d678e150388c76ce665e988fdf081
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 11:11:25 +02:00
Nikolai Kosjar
c67f7f6349 C++: Clean up CppPreprocessor
* const correctness
* 100 columns
* superfluous curly braces
* include order
* old qDebugs()

Change-Id: Id8012d3cf4e292b671cdbc1952ff13dde316791e
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-07-17 11:08:49 +02:00
Eike Ziller
c0e7cc8554 Find: Document contents should be retrieved from the documents directly
Instead of through an arbitrary set of editors on these documents.

Change-Id: I9de731b6e6edfc52fe5199b1f47456a3a8701d9a
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 09:49:26 +02:00
Eike Ziller
7808266fca TextEditors: Remove useless duplicated (set)textCodec methods
They are duplicated from TextDocument::(set)codec. The default
implementation of the duplicated methods was just delegating to the text
document. The override of setTextCodec in QmlJsEditor was useless, since
it was only called from EditorConfiguration::configureEditor with the
ITextEditor::TextCodecFromProjectSetting flag anyhow, which made the
overridden method in QmlJsEditor be the same as the fallback.
Aside from that, the duplicated methods wouldn't have belonged to the
*editor* anyhow, but to the document.

Change-Id: Ib43c28210b6bf88726159d751a4905a1d062f80e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-17 09:05:41 +02:00
Eike Ziller
fade19a9bf Move IEditor::createNew to IDocument::setContents
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>
2013-07-17 09:00:17 +02:00
Marco Bubke
0ba2b9b37d QmlDesigner: Add qdebugs for commands
Change-Id: I60bdd5b36749be5092d4dabe486b101d62b3df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 17:04:31 +02:00
Marco Bubke
8f22b84016 QmlDesigner: Fix the exit for qml puppet
Change-Id: I228e91711f6976e0e6d7b298d73f61cd8c25be23
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 17:00:31 +02:00
Marco Bubke
aa08da4143 QmlDesigner: Prefix for puppet output
Change-Id: If149ddb26e0e9852b6970ecac6f535499ea7b3af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-07-16 16:41:01 +02:00