feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
35,337 Commits 108 Branches 368 Tags
c2d20e49dc4187dba1d5dd07d11dcbc43db7ac2d
Commit Graph

763 Commits

Author SHA1 Message Date
Morten Johan Sorvig
b0cd54c1ec Replace Q_WS_MAC with Q_OS_MAC. 
We want to carry over all mac-specific code paths
to Qt 5. WS_MAC is no longer set; OS_MAC is.

This change is compatible with Qt 4 builds since
OS_MAC is set whenever WS_MAC is. (OS_MAC would
also be set for the theoretical X11/Mac platform,
but that's anyway not a supported configuration
for Creator)

Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-01-26 11:06:12 +01:00
Kai Koehne
f85df65594 FakeVim: Fix gcc warning about unused variable 
Change-Id: I2d88e568f91416cdc304446ccb9bd0d98a5eb654
Reviewed-by: hjk <qthjk@ovi.com>
 2012-01-06 11:24:17 +01:00
hjk
c9c9937b58 fakevim: fix cursor column after up/down in replace mode 
Change-Id: I1a7fe47f1a7bf875447e767edee57fcca4b344f3
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-30 23:23:37 +01:00
hjk
29eff52529 fakevim: rework undo/redo cursor positioning 
Change-Id: I1daa788377295fb1446f31d9a74b9fd0df6920d1
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-27 17:40:58 +01:00
hjk
c137cd9b5a fakevim: implement ctrl-a and ctrl-x 
Change-Id: If1f13b9e9cf806cff254aedc6dab9e669105f3d6
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-27 14:56:01 +01:00
hjk
29223bc117 fakevim: more vim-ish cursor positioning after undo/redo 
Change-Id: Ie689a719b023ed1e3756470bd144e22b1099bb07
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-26 16:42:55 +01:00
hjk
4443532d14 fakevim: record position before first keystroke as jump target 
Change-Id: I52942a46bcd42eee4f8452a61a899d6d9b706563
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-26 16:42:19 +01:00
hjk
57caa26a19 fakevim: make <Esc> and <CR> case insensitive 
Change-Id: I412b9774b0e642a763c55334192aca0ae4796a57
Reviewed-by: hjk <qthjk@ovi.com>
 2011-12-08 22:49:48 +01:00
hjk
9056dc384a fakevim: bs=2 "has" start 
Task-number: QTCREATORBUG-6640
Change-Id: Iaa90bd9c96207883dbb5889e1c0df544e3a1aa40
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-30 10:08:42 +01:00
hjk
a7e4f3ce04 fakevim: fix off-by-one when creating range from current line 
Task-number: QTCREATORBUG-6630
Change-Id: I33c009cb72396872b8d603011b81d7e441f27cf2
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-29 09:08:29 +01:00
hjk
c00cbcf574 fakevim: implement '&' 
Change-Id: I64f214d27306733a2840036816366d7a204cbc89
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-28 18:58:59 +01:00
hjk
d23e5f38b8 fakevim: implement gm 
Change-Id: I27d69414aff355dea1cf334830145dc50d407851
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-28 16:36:22 +01:00
hjk
794cee7ab0 fakevim: implement `. and '. 
Change-Id: Ida402d74ac6cbe41165e491ca7cf3321fdd3004e
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-28 16:06:57 +01:00
hjk
289a05a189 fakevim: fix cursor positioning after ]] etc. 
Change-Id: Ia42fccff507fce1e999d4534656984b6ebf5180a
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-17 01:13:25 +01:00
hjk
772c2b3cc5 fakevim: refactor register handling 
Change-Id: If3551627a8457853c0dedee7a61b388ff3232980
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-12 02:33:15 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
 2011-11-11 09:46:25 +01:00
hjk
ddc85fe192 fakevim: improve reading of mappings from .vimrc 
Change-Id: I3a575ae71c3c84dea98e2d35d1eda429a3c1ea66
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 16:14:48 +01:00
hjk
3a8c0f28b5 fakevim: properly split commands in source'd files 
Change-Id: Iebe4a1e4150374b9d35fe22910f38d7ca9b3ff4e
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 15:56:03 +01:00
hjk
0d906700df fakevim: allow extra colons at the start of an ex command 
Change-Id: I4ef27b5735140805f70d8a4806c7d47d08d69c23
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-10 12:51:43 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
Eike Ziller
912cd548c0 Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/projectexplorer/buildmanager.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.cpp
	src/plugins/qmljstools/qmljsqtstylecodeformatter.h
	tests/auto/qml/qmleditor/qmlcodeformatter/tst_qmlcodeformatter.cpp

Change-Id: I63ab2ba5dac006c37ccfbae55b023396a4676ff7
 2011-11-01 18:16:38 +01:00
hjk
f73dc6f444 fakevim: fix replacement of '\&' 
Task-number: QTCREATORBUG-6434
Change-Id: Ic6ec34288733c4aa46cee353acf3920f3b4cf9ce
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-01 10:44:16 +01:00
hjk
2ec51f5b2c fakevim: implement :<x>% 
Change-Id: I85d91429767519d7e2925e89feee6f3f83ddd3a9
Reviewed-by: hjk <qthjk@ovi.com>
 2011-10-28 14:16:56 +02:00
Eike Ziller
bf8cb5d4fc Merge remote-tracking branch 'origin/2.3' 
Conflicts:
	qtcreator.pri

Change-Id: Iaca68084799ae9aec257742c395609d6e8aa72cd
 2011-08-16 10:21:55 +02:00
hjk
7620d81ef0 Revert "fakevim: also set foreground color for search matches" 
This reverts commit c1f225fd8f.

This does not cover the case where the cursor is in the marked
text, which then blinks black-on-black.

Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad1
Reviewed-on: http://codereview.qt.nokia.com/2698
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-11 10:07:57 +02:00
hjk
30076b1c97 fakevim: remove visually selected contents before pasting. 
Task-number: QTCREATORBUG-5605
Change-Id: Iee28b1acaeb4d8ad073bfadb0aab277f11b5001f
Reviewed-on: http://codereview.qt.nokia.com/2669
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-05 08:49:13 +02:00
hjk
1a0056eea9 fakevim: v in visual mode actually leave visual mode 
Task-number: QTCREATORBUG-5603
Change-Id: I239837b1d8ad30fdc157a6eaec05a026c294a750
(cherry picked from commit 764f902cf3)
Reviewed-on: http://codereview.qt.nokia.com/2578
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-04 09:15:33 +02:00
hjk
86e6cc6728 fakevim: handle cursor keys in Replace mode 
Task-number: QTCREATORBUG-5647
Change-Id: I06bf6b859ac5111b5692c003aab2d003a0c7b110
(cherry picked from commit 18b74f087b)
Reviewed-on: http://codereview.qt.nokia.com/2577
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-04 09:14:41 +02:00
hjk
c1f225fd8f fakevim: also set foreground color for search matches 
Task-number: QTCREATORBUG-5604
Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad0
(cherry picked from commit 00be04e1ea)
Reviewed-on: http://codereview.qt.nokia.com/2576
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-04 09:13:57 +02:00
hjk
30b0370bed fakevim: fix endless loop in certain search&replace operations 
Task-number: QTCREATORBUG-5697
Change-Id: I25e9ef4ef042efa2b4dd670f5177e5e170fbaaf0
(cherry picked from commit d8fdd0acdc)
Reviewed-on: http://codereview.qt.nokia.com/2574
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-08-04 09:12:58 +02:00
hjk
d8fdd0acdc fakevim: fix endless loop in certain search&replace operations 
Task-number: QTCREATORBUG-5697
Change-Id: I25e9ef4ef042efa2b4dd670f5177e5e170fbaaf9
Reviewed-on: http://codereview.qt.nokia.com/2562
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-03 13:15:36 +02:00
hjk
00be04e1ea fakevim: also set foreground color for search matches 
Task-number: QTCREATORBUG-5604
Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad6
Reviewed-on: http://codereview.qt.nokia.com/2556
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-03 12:08:38 +02:00
hjk
d759a213f9 fakevim: make <Esc> leave DeleteSubMode 
Task-number: QTCREATORBUG-5636
Change-Id: I875b469d937e63b3486fe64c2763cf536b89ac8f
Reviewed-on: http://codereview.qt.nokia.com/2553
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-03 12:00:16 +02:00
hjk
18b74f087b fakevim: handle cursor keys in Replace mode 
Task-number: QTCREATORBUG-5647
Change-Id: I06bf6b859ac5111b5692c003aab2d003a0c7b11c
Reviewed-on: http://codereview.qt.nokia.com/2552
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-03 11:41:47 +02:00
hjk
764f902cf3 fakevim: v in visual mode actually leave visual mode 
Task-number: QTCREATORBUG-5603
Change-Id: I239837b1d8ad30fdc157a6eaec05a026c294a75c
Reviewed-on: http://codereview.qt.nokia.com/2525
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-02 18:00:17 +02:00
hjk
be4d9b946f fakevim: more interaction for entering ex commands 
Change-Id: I64e4d662fa9c89d4ac6a6d8b83711f01780ceaa6
Reviewed-on: http://codereview.qt.nokia.com/1700
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-08-01 09:34:21 +02:00
Kai Koehne
1757228278 New QTC_CHECK warning replacing QTC_ASSERT(x, /**/) 
Warn if the condition fails, but otherwise don't change the execution
flow.

Change-Id: Id7b14c745109b66960add967b2a4ef8d31e1a546
Reviewed-on: http://codereview.qt.nokia.com/2389
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-07-29 12:19:11 +02:00
hjk
5515b27af6 fakevim: fix <n>r<Return> 
Was reported on the feedback form.

Change-Id: Iab2517f4bd29bbad211eced7c268f93d928bb5aa
Reviewed-on: http://codereview.qt.nokia.com/1657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2011-07-14 17:42:53 +02:00
Friedemann Kleint
a56162ec6e tr()-Fixes for 2.3: No contractions, spelling. 
Change-Id: I08babdb15bcf7f7ac086e9e12955b780b7591391
Reviewed-on: http://codereview.qt.nokia.com/480
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
 2011-06-14 17:18:48 +02:00
hjk
355871a1d9 fakevim: parse <Esc> from script files 2011-05-17 16:50:27 +02:00
hjk
fcaa6b0d1b fakevim: further split 'handleCommand' 2011-05-16 17:22:05 +02:00
hjk
4c8a0f3a50 fakevim: compile fix on windows 
There's a limit on the number of 'else if' with MSVC.
 2011-05-16 11:08:18 +02:00
hjk
68dd1284f7 fakevim: implement Ctrl-y 2011-05-13 19:02:02 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
hjk
02a0e0d13a fakevim: fix searching for | 
Task-number: QTCREATORBUG-4752
 2011-05-03 11:20:58 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
hjk
a1e11f69a9 fakevim: Enforce use of RealControlModifier by breaking the compilation otherwise 2011-04-08 11:19:22 +02:00
hjk
d8b6837b45 fakevim: Try to fix Ctrl on Mac. Again. 
How clever can "clever default behaviour" get before it turns unclever...
 2011-04-07 18:00:46 +02:00
hjk
54eac56c00 fakevim: support snippets, by doing nothing. 
Reviewed-by: con
Task-number: QTCREATORBUG-4379
 2011-04-06 14:56:25 +02:00