Commit Graph

21107 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
ce1d728b9a Some code reorganization
Changing nothing, just preventing next patch to be scrambled by it.
2009-01-09 13:21:11 +01:00
hjk
816b83feed use ',' as "Escape to Application" schortcut 2009-01-09 12:51:10 +01:00
hjk
e83cf9727c grab Escape and Ctrl-R etc for fakevim when activated 2009-01-09 12:21:53 +01:00
dt
7e9cf0f3e0 Merge commit 'origin/master' 2009-01-08 18:30:23 +01:00
Roberto Raggi
c5f9695fe1 More work on ObjC++ support. 2009-01-08 18:06:01 +01:00
hjk
c8c362aa7d fix some cases where deletions were not recorded in the undo stack 2009-01-08 17:58:42 +01:00
dt
8c9e938385 Fixes: Crash in the flat model on certain changes to the pro file.
Task:     240180
Details:  Hopefully fixes a few crashes people have reported.
2009-01-08 17:44:48 +01:00
hjk
5b500bec79 code cleanup 2009-01-08 17:40:27 +01:00
hjk
2ed47d3284 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 17:22:50 +01:00
hjk
3f53aa16fb handle ! at least in visual line mode 2009-01-08 17:21:51 +01:00
Thorbjørn Lindeijer
2c0a52098e Whoops, forgot to remove an include 2009-01-08 17:10:39 +01:00
dt
cda38c23f1 Fixes: Do not pop up the Application Output if run in the debugger.
Task:     Reported on irc.
Details:  I think this is nicer, while debugging, you probably need
those extra pixels for the other views. We need some flash on the
application button to make it more obvious that something was added to
it.
2009-01-08 16:59:46 +01:00
Thorbjørn Lindeijer
57ab0b9e8e Changed categories used for pro file highlighting
Now reuses the colors set for Type and Keyword for the variables and
functions respectively. Having the categories Variable and Function in
the fonts and color settings was confusing.
2009-01-08 16:15:25 +01:00
Thorbjørn Lindeijer
171a3bb8d2 Fixed compilation problem with gcc 3.3
Reviewed-by: Roberto Raggi
2009-01-08 15:09:21 +01:00
Thorbjørn Lindeijer
2c74d01e94 Fixed 'make docs' lauching of qhelpgenerator
It assumed qhelpgenerator was in the path, though this isn't necessarily
the case. Use the absolute directory instead.
2009-01-08 13:50:24 +01:00
hjk
ef05697fdb Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 13:43:50 +01:00
Daniel Molkentin
0225cc85ca centralize runstep definitions further 2009-01-08 13:24:34 -08:00
hjk
95fbb4842b handle 'P' 2009-01-08 13:43:24 +01:00
hjk
cab13a5a6d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 13:16:51 +01:00
hjk
ef259344c5 make the key handlers return a bool indication whether they acted on the
key or not.
2009-01-08 13:16:04 +01:00
Roberto Raggi
c45c48bdfa Return true if we can recognize an objc-identifier-list. 2009-01-08 13:06:09 +01:00
dt
dfa436ef3b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 13:04:00 +01:00
Roberto Raggi
0f4e245873 Some progress in parsing objc++ and submitted ObjectiveCAtKeywords.cpp 2009-01-08 12:56:07 +01:00
Roberto Raggi
7b3bcfa5fa Parse ObjC identifier list. 2009-01-08 12:56:07 +01:00
Roberto Raggi
a725915ee0 Parse ObjC @class declarations. 2009-01-08 12:56:07 +01:00
Roberto Raggi
fe4fc6d540 Handle toplevel objc++ declarations. 2009-01-08 12:56:07 +01:00
Roberto Raggi
b2ff63145b Added objcEnabled()/setObjcEnabled() to SimpleLexer. 2009-01-08 12:56:07 +01:00
hjk
c06c77daaa Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 11:50:47 +01:00
hjk
c9b2dfc363 implement QLinkedList dumper 2009-01-08 11:50:20 +01:00
Roberto Raggi
57c10b601a Recognize Objective C @tokens. 2009-01-08 11:29:05 +01:00
hjk
2d8af0709d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 11:02:58 +01:00
hjk
7b47bd48e1 add some test code for the yet-to-be-born QLinkedList dumper 2009-01-08 11:02:04 +01:00
Jarek Kobus
629832ce59 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-08 10:48:16 +01:00
Jarek Kobus
1b77e4e99e Talked to hjk, restore back Q_ASSERTs, since qtcassert.h lies outside of shared dir 2009-01-08 10:46:00 +01:00
con
0bbed6d786 Fixes: - Executable for console app are not found on Mac 2009-01-07 18:53:58 +01:00
hjk
92e447e987 remove some accidentally commited debug output 2009-01-07 18:11:40 +01:00
hjk
f85c38621b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-07 18:06:04 +01:00
hjk
993be401ef work on fakevim integration 2009-01-07 18:05:45 +01:00
Roberto Raggi
807f17b500 Added the ability to clone AST nodes. Please, note that this is not finished yet. So don't try to use it. 2009-01-07 17:52:01 +01:00
hjk
3005f28462 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-07 17:41:43 +01:00
Daniel Molkentin
b3445ab65a Put completion widget on correct desktop for good. 2009-01-07 17:07:56 -08:00
hjk
634edf2aab somewhat better intergration of fakevim into creator 2009-01-07 17:41:09 +01:00
hjk
db595e2f41 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-07 16:29:39 +01:00
hjk
a598aa12b6 add dumper for QMultiMap 2009-01-07 16:29:14 +01:00
con
4501ee9ed5 Fixes: - Mac build (docs) and toplevel "make docs" target
RevBy:    - bjørn
2009-01-07 15:48:44 +01:00
hjk
16b2c83dc8 add a test case for multimaps 2009-01-07 15:31:58 +01:00
hjk
de37622748 Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-07 15:16:31 +01:00
hjk
b4c1552ec2 handle Qt 4.4 and Qt 4.5's QMap in dumpers 2009-01-07 15:03:49 +01:00
Jens Bache-Wiig
7800e33c18 Fixes: Dont use repeat on togglebutton stylesheet
RevBy:    ogoffart
Details:
These should be normal scaled fill.
2009-01-07 14:12:06 +01:00
Friedemann Kleint
352cf14353 Fixes: Add way to create a new local branch in the git plugin
Task: 205821
Details: Split up the branch model into remote branch base class and extended local branch class with <New Branch> row.
2009-01-07 12:58:31 +01:00