feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
27,676 Commits 108 Branches 368 Tags
45b021331ed6c35ece4e3c28f53a12bc90cddcd9
Commit Graph

514 Commits

Author SHA1 Message Date
David Schulz
45b021331e Editor: Renaming Link members. 
Change-Id: I1ae21152ee7b8e2a9323322575de23d77c260c72
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-02-11 16:00:52 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
 2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
David Schulz
2f9574582d Editor: Disable adding UTF-8 BOM for qmake project files 
Removes the "Add/Remove UTF-8 BOM" entry in the context menu
of the project file editor. Also ignores the setting
"Add If Encoding Is UTF-8" under
Options -> Text Editor -> Behavior -> File Encodings.

Task-number: QTCREATORBUG-8501

Change-Id: I368966b5235ee60011f2051ebdb82f9fe09bc4cc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
 2013-01-24 15:44:05 +01:00
Jarek Kobus
d3286c2ce0 Add some methods which will be needed by diff editor 
Change-Id: Iae85e123a5b72e85b8b55359267bc1b2810a640b
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-22 16:05:15 +01:00
Daniel Teske
52dc1c9ec9 Compile fix 
Change-Id: I2812a7e59ee20511b9804337d836e1707894a7be
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-11 17:54:18 +01:00
Christian Stenger
e2306b0537 Editor: Compile fix 
Change-Id: I61ac997547b6cbeec6c4acaa464162237bb56911
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-01-11 16:45:32 +01:00
Daniel Teske
8e75e611a5 Move TextEditor::ToolTip to Utils 
To enabled reuse from all plugins.

Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-11 15:06:00 +01:00
Petar Perisin
39e9c5ef20 Editor: Allow to open links in a new split. 
This changes current behavior while opening links. Link is now opened in
next split by default. If you use CTRL+Click to open links, it will also
open in next split. However, by using CTRL+ALT+click it will open in
current split.

There are two new checkboxes in Tools/Options/Text Editor/Display:
- "Open Links in New Split" - if it is checked, links will not be opened
in current split. However, if document with link is already opened, it
will be used to open the split
- "Force open links in next split" - Links will always open in next
split, even if their document is already opened somewhere else.

Task-number: QTCREATORBUG-8117
Change-Id: Ib99075b55d9e9683ed2c2386767227457de0a3fc
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-11 12:48:44 +01:00
Orgad Shaneh
38f6c349e1 TextEditor: Keep cursor in beginning of line on moveLineUpDown 
Moving it to line end scrolls right with long lines

Change-Id: I1fb0cb072a6c57b7e7e53b258567f6842b845fb0
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-10 12:49:09 +01:00
Debao Zhang
4a32f1d821 use QSharedPointer instead of QRefCountPointer 
Change-Id: Ie670448bf924e02720eae6db33f2a346e8ac0001
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2013-01-09 08:59:28 +01:00
Orgad Shaneh
29a93998df Remove braces for single lines of conditions 
#!/usr/bin/env ruby

Dir.glob('**/*.cpp') { |file|
  # skip ast (excluding paste, astpath, and canv'ast'imer)
  next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i
  s = File.read(file)
  next if s.include?('qlalr')
  orig = s.dup
  s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m|
    res = $&
    if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces
      res
    else
      res.gsub!('} else', 'else')
      res.gsub!(/\n +} *\n/m, "\n")
      res.gsub(/ *{$/, '')
    end
  }
  s.gsub!(/ *$/, '')
  File.open(file, 'wb').write(s) if s != orig
}

Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-08 10:48:18 +01:00
Orgad Shaneh
a44aa55502 Add whitespace after control keywords 
find -name \*.cpp -o -name \*.h | \
  xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'

Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-28 20:20:46 +01:00
Mitch Curtis
e237057827 Make insertLineAbove behaviour consistent when at top of document. 
Currently, pressing Ctrl+Shift+Enter to insert a line above the current
line does not work consistently when the current line is the first in
the document. For example, if the cursor (|) is not on the first line:

1. #include <QDebug>
2.|#include <QTest>

becomes

1. #include <QDebug>
2.|
3. #include <QTest>

after Ctrl+Shift+Enter. When the cursor is on the first line, however:

1.|#include <QDebug>
2. #include <QTest>

becomes

1. #include <QDebug>
2.|
3. #include <QTest>

after Ctrl+Shift+Enter. This patch corrects the above result:

1. |
2. #include <QDebug>
3. #include <QTest>

This is also in line with Eclipse's behaviour, for example.

Change-Id: I542050b6090ed0cfdf613bf67bbd2651eb99ec9d
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-11-26 15:23:55 +01:00
Orgad Shaneh
65942d2d8d TextEditor: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: If913f595de78dc8bc4eff1a5c3ad7fe8d5a623ae
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-11-26 13:29:33 +01:00
Orgad Shaneh
7fa69afa6c Use Core::Id for language 
Change-Id: I0077558e9e2cf5aa06ac921cb45224e29aa85c9b
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-22 08:32:44 +01:00
Marcel Krems
e440ec8a62 BaseTextEditor: Fixed dragging of ITextMarks. 
Only start dragging, when a draggable marker was clicked.
Reset drag after releasing mouse button.

Change-Id: I2dc275fc108b55d84b9ff5c69847b116c3307c41
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-16 10:50:57 +01:00
David Schulz
5aa0412b8e Editor: Fix highlighting issue after code unfold. 
Task-number: QTCREATORBUG-8232

Change-Id: I2595855bb7efe669e3c48a16ab162ace54f7015a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-11-12 15:22:05 +01:00
David Schulz
f224c68b32 Editor: Fix animate matching parenthesis in folded code 
Task-number: QTCREATORBUG-5877

Change-Id: I1012a1f8d8f925ed1a002d457b856df103e9f703
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-11-12 15:21:45 +01:00
Orgad Shaneh
10be8c9a48 InfoBar: Use Core::Id 
Change-Id: I0918fbc20027a340facbedc685938a72d117d53b
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-09 15:34:50 +01:00
Christian Kandeler
e64543aa61 TextEditor: Remove unneeded ifdefs. 
Change-Id: I21b508b4fc911296aee1c077445c7d6c1e765c20
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-11-06 16:16:10 +01:00
hjk
2a5d883424 texteditor: handle higher prioritized markers first 
Change-Id: Id526f7544db89fae9c15afa0605ab9b0ecdcaf8e
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-10-22 09:08:07 +02:00
Vasiliy Sorokin
6a90a1a740 Add Highlight Matching Parentheses setting 
Task-number: QTCREATORBUG-8008

Change-Id: If1989eb850e82636c735a319bc7c4950a01dd33c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-10-18 11:05:05 +02:00
hjk
381a60b7db BaseTextEditor: make ITextMarks draggable 
Change-Id: I36fd6d49ec99975d059f201aa23db11dd80e4ad6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-11 17:41:21 +02:00
hjk
2e361d20ab TextEditor: adjust ITextMark getters to coding style 
bool getters should have an 'is' prefix.

Change-Id: I6d8b0a680e7985fa454b5e7df1b85ace6da264e6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-10 12:17:12 +02:00
Lukas Holecek
f5f04eac92 Editor: Open parent folds recursively until cursor is visible 
Fixes case when cursor jumps on hidden line in folded block which is in
another folded block. All parent folded blocks will be unfolded until
cursor is visible.

Change-Id: I3d41542506d9f40cb9e75d1b2818bc5767384d93
Reviewed-by: hjk <qthjk@ovi.com>
 2012-10-09 23:57:14 +02:00
Eike Ziller
086dd684ab Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/fileiconprovider.cpp
	src/plugins/cppeditor/cppplugin.cpp
	tests/auto/qml/qmldesigner/coretests/coretests.pro

Change-Id: I0e83becf661ded9316ce6766786c9ef4c2f897a7
 2012-10-09 14:27:29 +02:00
Friedemann Kleint
7e33227146 Replace remaining Q_WS_WIN by Q_OS_WIN. 
Task-number: QTCREATORBUG-72
Change-Id: I36f532ebd61472cd6e3d8e63decc96613cc7fab4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-09 12:36:57 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
 2012-10-05 21:20:50 +02:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Vasiliy Sorokin
d47b058c9b Added feature for change note for bookmarks. 
Task-number: QTCREATORBUG-5572

Change-Id: I12e84928e1c9d2b212991fafa7de99e0ec618d70
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-01 21:08:27 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
 2012-09-27 20:38:57 +02:00
David Schulz
b1bb59aeff Editor: Fix autocompletion under Qt5 
Change-Id: Id8ce9ebe53823abe211e43c7c44ec19a24ed63f5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-09-27 12:23:50 +02:00
Lukas Holecek
5442e745e7 Highlight matching parentheses under text cursor 
In replace mode highlight parentheses that are right under the block
cursor.

Change-Id: I6cef5fe302b0797c66ed9541d28ec495fb1db1d1
Reviewed-by: David Schulz <david.schulz@digia.com>
 2012-09-27 09:57:23 +02:00
Lukas Holecek
f750bba667 Fix block text cursor visibility on extra selections 
Change-Id: Ica1307863ebaf713cf07a4fdce2623b1d20344c3
Reviewed-by: hjk <qthjk@ovi.com>
 2012-09-27 09:41:28 +02:00
Eike Ziller
b947861c59 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5
 2012-09-19 18:02:46 +02:00
David Schulz
71c2f2810e Editor: correct background color for matching parentheses 
Task-number: QTCREATORBUG-512

Change-Id: I09a52bcf98e0f2c0bc2e68df4821f94714873580
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
 2012-09-18 15:50:21 +02:00
David Schulz
00a412f716 Editor: Fix leaving block caret. 
After switching from "Overwrite" to "Normal" mode using the Insert-key.

Task-number: QTCREATORBUG-6831

Change-Id: I5507c91318af1f2d2244e9ca978ef9badfd8c2b0
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
 2012-09-17 15:41:15 +02:00
Christian Kandeler
405217c111 Utils::HostOsInfo: Introduce controlModifier() method. 
Change-Id: Ibd244963c5cd643fc0e8358ceabff0ad5f6599eb
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-13 10:14:53 +02:00
Daniel Teske
4083c11002 Optimize painting after changing marks 
Change-Id: Ib9e225bc063df82fcb351ff1e2572aa2d663b8a7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-09-11 15:45:55 +02:00
Eike Ziller
5ac721dd58 Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/utils/utils.pro

Change-Id: I6f0aba746f915d8c51dcf9372f7d9f593562fc2b
 2012-09-11 14:02:03 +02:00
Friedemann Kleint
2c3fe560b9 tr()-Fixes: Fix spelling errors in text editor settings. 
"Occurrences", "parentheses", "applied to".

Change-Id: I48d3d4e6c10e29888f4f2ee6dfbe02b0b0c5646b
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-09-05 15:29:51 +02:00
Eike Ziller
887456e38a Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemoglobal.cpp
	src/plugins/madde/maemoinstalltosysrootstep.cpp
	src/plugins/madde/maemopublisherfremantlefree.cpp
	src/plugins/madde/qt4maemodeployconfiguration.cpp
	src/plugins/qt4projectmanager/librarydetailscontroller.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/plugins/remotelinux/abstractremotelinuxdeployservice.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/remotelinuxdeployconfigurationfactory.cpp
	src/plugins/remotelinux/remotelinuxrunconfiguration.cpp
	src/plugins/remotelinux/remotelinuxrunconfigurationfactory.cpp

Change-Id: I2560b528596f284e7b45a2260d8d3037891c5d17
 2012-09-04 18:04:16 +02:00
Christian Stenger
f3e92100cb Editor: Fix transformSelection() for block selection 
Task-number: QTCREATORBUG-7643

Change-Id: I26f9a3637a39a26e82b72de1143e31b5e55b076e
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-09-03 10:10:36 +02:00
Christian Kandeler
e669f05406 Utils: Introduce HostOsInfo class. 
The class' member functions are intended to be used
instead of the Q_OS_* macros in all contexts where
the latter are not syntactically required.
This lowers the likelihood of changes made on one
platform breaking the build on another, e.g. due to
the code model missing symbols in #ifdef'ed out code
when refactoring.

Change-Id: I4a54788591b4c8f8d589b8368a6c683d4155c9fa
Reviewed-by: hjk <qthjk@ovi.com>
 2012-08-27 17:00:03 +02:00
Konstantin Tokarev
b0da247604 Unified contextMenuEvent implementations of editor widgets. 
Change-Id: Ie5dbde8d0443a65a8e96853002c8bdafd2c0d729
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-07-30 10:21:42 +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
Francois Ferrand
6defb83d03 TextEditor: menu for pasting from clipboard history. 
Add new action to show a menu of recent clipboard history. When an item
is selected, the item is pasted.

Change-Id: Id7e1a90730404fb63762bf1f20678484ec34cd2b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
 2012-06-05 12:08:00 +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
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