Roberto Raggi
1a1b841cdb
Fixed parsing of ambiguous name ids.
2009-04-28 19:02:28 +02:00
mae
3b917fde19
mac fix for parenthesis matching
2009-04-28 19:02:58 +02:00
mae
d213532a0f
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 18:35:32 +02:00
mae
5df82ab502
experiment with a different way of doing parenthesis matching. This is not finished and
...
work in progress.
2009-04-28 18:34:58 +02:00
Oswald Buddenhagen
7a92668dab
indent some css
2009-04-28 17:34:06 +02:00
Oswald Buddenhagen
3e24c440b1
simplify css
2009-04-28 17:34:06 +02:00
Oswald Buddenhagen
e02213e7d1
make welcome page fully translatable
...
... by eliminating images containing text.
of course, this causes some stylistic issues. oh, well.
2009-04-28 17:34:06 +02:00
dt
dfd0c9f91a
Crash found by ErikV in the Dependencies Model with unloading projects
...
We didn't update the dependencies model in case a project gets loaded or
unloaded. (Or the session switched.) In that case we do a rather drastic
reset() now.
2009-04-28 17:23:33 +02:00
dt
eae597f5b7
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 15:41:02 +02:00
dt
a6ad9b388d
If a BuildStepFactory isn't available, still restore correctly
...
We used to restore to the wrong BuildStep if we couldn't find a factory
for a build step. Unfourtanetly that's exactly what a 1.1 project
loading a 1.0 project does. So some settings are lost.
This fixes that.
2009-04-28 15:40:41 +02:00
hjk
d37a2d3aad
debugger: introduce enabling/disabling of breakpoints
2009-04-28 15:09:23 +02:00
Roberto Raggi
5c5452db1e
Merge branch 'master' of ../mainline into dui-editor
2009-04-28 14:47:47 +02:00
dt
72eb8dc933
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 14:30:43 +02:00
dt
6c5e23f10e
Fix $$OUT_PWD not beeing set for finding the target/destdir
...
Qt Creator wouldn't find the correct target if shadow building a project
that uses $$OUT_PWD, like for example itemviews-ng.
We didn't set the necessary variable on the ProFileReader *, simplified
the code to always use a ProFileReader created for the exact
profilenode.
2009-04-28 14:30:17 +02:00
mae
d860cb4b81
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 12:55:54 +02:00
mae
606ce15431
more tweaking
2009-04-28 12:55:31 +02:00
dt
842d376e21
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 12:45:23 +02:00
Roberto Raggi
2fd03d3aba
Merge branch 'master' of ../mainline into dui-editor
2009-04-28 12:45:07 +02:00
dt
2b302332b8
Move QtVersionManager, QtVersion and QtOptionsPage back
...
After all I don't need all that stuff in the cmakeplugin, all i needed
is now bundled in debugginghelper.h/cpp
2009-04-28 12:45:04 +02:00
mae
0b81651839
more traditional defaults, this is stuff in progress.
2009-04-28 12:03:06 +02:00
dt
1c722840fb
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-28 11:57:29 +02:00
mae
a8be2532d1
tune block highlighting
...
done with Thorbjorn
2009-04-28 11:43:13 +02:00
Roberto Raggi
57791d78d4
Merge branch 'master' of ../mainline into dui-editor
2009-04-28 10:26:42 +02:00
Roberto Raggi
aa91106810
Added support for .qml files.
2009-04-28 10:26:07 +02:00
Thorbjørn Lindeijer
092d8ca964
Restored changes to the overview combo that accidentally got reverted
...
Accidentally reverted in commit 713105ad85
2009-04-27 17:27:36 +02:00
Thorbjørn Lindeijer
968a3c0f9f
Added 'current line number' to color theme settings
...
Recently it was made to highlight black or write, which isn't nice for
everybody. Now it is dark gray by default, and can be customized. Bold
and italic are also supported.
2009-04-27 14:10:54 +02:00
Thorbjørn Lindeijer
ffaea3fcd5
Fixed flicker when updating highlighting of matching brace
...
By not removing it before setting an updated selection.
Reviewed-by: mae
2009-04-27 13:01:28 +02:00
Roberto Raggi
6fe121b648
Merge branch 'master' of ../mainline into dui-editor
2009-04-27 12:40:33 +02:00
mae
8d59b0ab64
eat tooltip events when control is pressed, otherwise the tools
...
destroy the navigation experience
2009-04-24 18:16:30 +02:00
mae
7f64e11cc1
the comma operator in C++ is evil
2009-04-24 18:12:36 +02:00
mae
b9e376f5dd
fix block highlighting off-by-one
2009-04-24 18:08:22 +02:00
con
13c699e240
Missing files.
2009-04-24 16:48:07 +02:00
mae
73414801c4
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-24 16:45:16 +02:00
mae
5f89921179
polishing of block highlighting, and a new folder bar.
2009-04-24 16:44:48 +02:00
con
713105ad85
Some documentation.
2009-04-24 16:34:24 +02:00
dt
48fe0f450f
Refactoring: Move all the debugging helper static methods into a class
...
Enables me to move some stuff back again.
2009-04-24 16:21:51 +02:00
dt
84637dfc55
Remove unused code and change indentation.
2009-04-24 16:09:22 +02:00
dt
b419403b0f
Refactoring: Use one common code to find the debugging helper library
...
Remove duplicated code from cmakeprojectmanager.
2009-04-24 14:59:47 +02:00
Friedemann Kleint
78e5293f43
Continue German translation.
2009-04-24 14:01:11 +02:00
dt
55cc9fed5c
Make Environment::searchInPath() const
...
Doesn't modify environment.
2009-04-24 14:00:43 +02:00
dt
d03b5714c7
Fix obscure crash in Find when no FindFilter exist.
...
Can only happpen if the user disables all plugins...
2009-04-24 13:34:02 +02:00
con
9e9523b8b0
Make sorting of method overview optional.
...
You can switch between sorted/unsorted via the method overview's context
menu.
2009-04-24 12:35:45 +02:00
dt
fefe6b378f
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-24 12:32:21 +02:00
con
ff2afcab5a
Sort method combo box alphabetically.
...
Patch received by Kris Wong.
2009-04-24 10:27:01 +02:00
con
5c9778e7ad
Be less picky about "qmake --version" output.
...
Older qmake versions have different output, don't be case sensitive.
Problems were reported with Qt Embedded 4.1.4.
2009-04-24 10:20:23 +02:00
Roberto Raggi
915510b87e
Merge ../mainline into dui-editor
2009-04-24 09:07:38 +02:00
mae
dfd2c5dbc3
small block highlighting cleanup for the no-wrapping case with overlong lines
2009-04-23 20:11:00 +02:00
mae
a180345b16
make move line up/down only move the selected line if the end of the selection
...
is at the beginning of the next block. Join the undo commands for subsequent moves.
2009-04-23 19:24:57 +02:00
mae
341d8d5622
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-04-23 17:30:12 +02:00
Oswald Buddenhagen
840cf145f3
don't oversize sessions frame when it is smaller than the projects frame
2009-04-23 17:30:23 +02:00
