1dcabe5a3a
Merge branch '1.0.0'
...
Conflicts:
tests/auto/cplusplus/shared/shared.pri
tests/auto/cplusplus/shared/shared.pro
2009-02-09 10:54:36 +01:00
1f9bcd86e0
Added a simple auto test for the name lookup.
2009-02-09 10:21:29 +01:00
47a85d5a42
Accept T_COLON_COLON only for the first objc message arg.
2009-02-06 16:28:00 +01:00
dd65867d17
Fixes: Parsing of objc selector expressions.
2009-02-06 15:51:17 +01:00
7b2b182774
Fixes: Parsing of objc method definitions.
2009-02-06 15:13:12 +01:00
3b7c35fa9b
Fixes: Toolbar cosmetic problem
...
RevBy: b_lindeijer
Details:
This resolves the problem with missing top-borders on
the find toolbar.
(cherry picked from commit e5c845fcc7
2009-02-06 15:05:58 +01:00
932845fc36
Don't use the name twice, though
...
We shouldn't append the name in cases where the text was not empty but
_name was.
Reviewed-by: Roberto
2009-02-06 14:50:58 +01:00
233502a795
Fixed tooltips for enumerators
...
The helpId was working but the tooltip text was empty.
Reviewed-by: Roberto
2009-02-06 14:43:13 +01:00
903457ee69
Fix compile warning
...
Should be pretty safe to cast the apparently unsigned return value of
"sizeof" to a regular integer.
2009-02-06 14:21:38 +01:00
d668b9b1f1
Added tooltips to editor settings and tweaked layout
...
Looks a bit nicer now and the tooltips explain some of the options a bit
better. Header texts have also been simplified.
(cherry picked from commit ad5bdf6969
2009-02-06 14:10:33 +01:00
0bab3d91e6
Fixed title of dialog
2009-02-06 14:06:56 +01:00
c71edd7763
Fixes: Finding the ui*.h files so that we can parse those.
2009-02-06 13:26:21 +01:00
dd9ccc517b
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
2009-02-06 11:40:53 +01:00
8c0aa2d207
Fixes: Parsing of block declarations in an @implementation block.
2009-02-06 11:36:39 +01:00
452475f8e4
Fixed sentence.
2009-02-06 11:20:32 +01:00
ec4302a18f
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
2009-02-05 19:35:25 +01:00
2c4023b5dc
Fixes: Hopefully parse more gcc/ld errors.
...
Details: If we know don't parse some errors, then i'd like to know.
2009-02-05 17:19:27 +01:00
4ef83082f6
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-02-05 17:07:18 +01:00
58e8aed6f0
Fixes: fakevim: keep selection when moving in and out fakevim
...
mode
2009-02-05 17:06:45 +01:00
4d4324628a
Fixes: After adding a new qt version via import, writeSettings()
...
Task: Reported on irc
2009-02-05 16:22:32 +01:00
5fcf35039f
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
2009-02-05 15:56:57 +01:00
68552b8f4d
Added fast lookup of objc type qualifiers.
2009-02-05 15:06:48 +01:00
bbef5052dc
Fixes: Also Patch QtCore dll in /lib on windows, specify correct path to patch for debug infos
2009-02-05 15:06:07 +01:00
ad5bdf6969
Added tooltips to editor settings and tweaked layout
...
Looks a bit nicer now and the tooltips explain some of the options a bit
better. Header texts have also been simplified.
2009-02-05 14:58:28 +01:00
8321683694
Fixes: Compile with msvc
2009-02-05 14:39:53 +01:00
c7c0386a34
Fixes: Mime type for objc files.
2009-02-05 14:34:13 +01:00
bb095fadd2
Fixes: Highlighting of objc #import directive.
2009-02-05 14:30:25 +01:00
4ffed7a119
Fixes: Parsing of #import directives.
2009-02-05 14:30:25 +01:00
c00e30187c
Fixes: Parsing objc method definitions.
2009-02-05 14:30:25 +01:00
f9737ddc41
Fixes: Accept OBJECTIVE_SOURCES.
2009-02-05 14:30:24 +01:00
d7defc6fe0
Fixes: Parsing of GCC asm definitions.
2009-02-05 14:30:24 +01:00
40eabdd008
Improved parsing of objc message expressions.
2009-02-05 14:30:24 +01:00
56b48c2362
Fixes: Enable ObjC support.
2009-02-05 14:30:24 +01:00
88b4dd35dc
Fixes: Parsing of objc message expressions.
2009-02-05 14:30:23 +01:00
58ff27bd83
Fixes: Parsing of objc string literals and selector expressions.
2009-02-05 14:30:23 +01:00
debe2a0d93
Fixes: Parsing of objc protocol expressions.
2009-02-05 14:30:23 +01:00
26560ca9d2
Parse objc encode expressions.
2009-02-05 14:30:23 +01:00
fa5b8508a0
Dummy method for the objc expressions.
2009-02-05 14:30:22 +01:00
da6667d51d
Fixes: Remove unneeded translations
...
RevBy: Roberto
2009-02-05 14:04:58 +01:00
0359ff60f6
Use QActions to fix toolbar extension
...
Instead of directly adding QToolButtons to the tool bar of the
navigation subwidget, use QActions. This allows the tool bar extension
to show them in a menu when necessary.
The icons are inappropriate for in a menu, however.
2009-02-05 12:49:45 +01:00
147859439d
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
2009-02-05 12:36:27 +01:00
bf7dae57de
Fixes: remove use of qttest_p4.prf
...
Details: makes it compile now with Qt snapshots
2009-02-05 12:35:37 +01:00
d5560b4bbd
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-02-05 12:16:24 +01:00
fb206c3fe2
make inplace activation the default editor activation, unless the
...
view has been specified. This allows to use the open editors view
as tabbar replacement also in split mode.
2009-02-05 12:15:51 +01:00
fa4bab5075
Fixes: Also do this for objective_sources, probably they need that to.
2009-02-05 12:01:01 +01:00
2f24b3965f
Patch also the Qt libraries in lib
...
Apparently these libraries are duplicated on Windows.
Reviewed-by: Danimo
2009-02-05 11:24:32 +01:00
71f8cb835f
Fixed the libs patcher paths
...
It was taking the wrong length when constructing the new paths.
Reviewed-by: Danimo
2009-02-05 11:07:43 +01:00
d21a4f8406
Fixes: Compile.
2009-02-05 10:34:43 +01:00
ec113e27a9
Merge branch '0.9.2-rc1' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.2-rc1
2009-02-05 10:23:08 +01:00
7c1ebd6dc9
Fixes: compile fix for cplusplus autotests
2009-02-05 10:22:51 +01:00
con
Jens Bache-Wiig
Thorbjørn Lindeijer
Daniel Molkentin
Roberto Raggi
Friedemann Kleint