Daniel Molkentin
1439742dbb
Remove debugging output
2009-08-06 18:05:58 +02:00
dt
b6087aff74
Add a missing space in the summary text
2009-08-06 17:35:11 +02:00
dt
5a3d33716c
Update summary on changes to the Environment
2009-08-06 17:30:49 +02:00
dt
109cb04102
Fix CMake Project to work with new project settigns pane.
2009-08-06 17:30:49 +02:00
dt
8c5023b36c
Add the missing black line.
2009-08-06 17:30:49 +02:00
con
0fee3776e8
Extract the special mainwindow behavior of the debug mode into class.
2009-08-06 16:35:22 +02:00
con
89642119c0
Remove unused code path for signal-slot editor yes/no.
2009-08-06 16:35:22 +02:00
dt
5146d23169
Debugging output
2009-08-06 16:17:04 +02:00
Daniel Molkentin
2948651fa9
Show tutorials in context help pane by default, but honor context help settings.
...
Reviewed-by: kh
2009-08-06 15:54:09 +02:00
dt
dbe5a6f34b
Rework the project settings.
...
This has still a few missing things, but this enough to start getting
some feedback. Missing are non qt projects, a solution for the
runconfiguration, a missing black line between the treeview on top and
the project settings at the bottom. Some flickering with removing/adding
widgets to the QScrollArea and not showing the expanded widget if the
Details button is right at the bottom.
2009-08-06 15:31:32 +02:00
Erik Verbruggen
4e7881577d
Parser fix for ObjC methods.
2009-08-06 13:44:33 +02:00
Erik Verbruggen
397bd2ed24
Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline
2009-08-06 09:41:08 +02:00
Erik Verbruggen
86a7b26fcd
Fixed semantic checks for Objective-C methods and fast-enumeration.
2009-08-05 18:30:18 +02:00
Erik Verbruggen
ca34b0ca1c
Cleaned the ObjC AST up.
2009-08-05 17:14:08 +02:00
con
fe92b40f45
Start on rvct support.
...
It works, except that the code model doesn't get the rvct include
directories and defines yet. And you need to have everything for
rvct set up in your environment.
2009-08-05 17:08:15 +02:00
con
c8d6c400b6
If no mwc path is set explicitly, still don't destroy working environment.
...
So now we use the values of the system environment as a backup
for build environment and system includes.
2009-08-05 17:08:14 +02:00
mae
700df76b47
fix alt-tab navigation in the original split
2009-08-05 16:02:05 +02:00
mae
f0218b8ff4
fix occasionally broken link to the modified state of the editor
2009-08-05 16:02:04 +02:00
con
5b2abd8510
Searching in files takes open editors into account now.
...
Task-number: 258468
2009-08-05 13:29:16 +02:00
con
a81eba5bf8
Some dependency declaration cleanup.
2009-08-05 13:29:16 +02:00
Andy Shaw
58ab81bfe4
Fixes: Link error on Windows, this slot should not be there
2009-08-05 13:23:51 +02:00
Andy Shaw
dc17081b50
Fixes: Compile on Windows
2009-08-05 13:18:56 +02:00
dt
a215f90c78
Fixes compilation
2009-08-05 13:00:02 +02:00
dt
9cfe707831
Disable the browse button if the shadow build checkbox is disabled.
2009-08-05 13:00:02 +02:00
Oswald Buddenhagen
63fd503c67
fix compile the proper way
...
older gcc does not automatically make nested classes of a friend class
friends as well.
2009-08-05 12:38:02 +02:00
Oswald Buddenhagen
1b0fbbffad
don't hang in .qmake.cache search when build dir does not exist
...
QDir::cdUp() is strange ...
2009-08-05 12:38:02 +02:00
dt
d24cd037fd
Change the apppereanve slightly for environment widgets.
2009-08-05 11:41:37 +02:00
dt
7be8be2564
Fix wrong importing of old settings overwritting a release configuration
2009-08-05 11:41:37 +02:00
Erik Verbruggen
0d5d39087f
Fixed build problem by removing the private.
2009-08-05 10:57:49 +02:00
Roberto Raggi
393806696d
The parser needs to a valid AST when the parsing method returns `true'.
2009-08-05 09:59:11 +02:00
Alessandro Portale
80e26d86c9
Using QDir::toNativeSeparators
2009-08-05 09:17:26 +02:00
Oswald Buddenhagen
ca5f1ee294
remove seemingly superfluous path normalizations
...
they were added to facilitate .prf exclusion from the project tree, but
that should be handled differently already.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
b972177444
don't report prf inclusions to derived classes
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
81f6001f91
move include recursion check to evaluateFile() where it belongs
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
f4cc46d5de
move qmake property hash to option object
...
that way they are auto-inherited by nested parsers, and it's the right
thing to do anyway.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
f50952f17a
complain about querying non-existing properties
...
... except where it is expected
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
a89bee6dab
rely on the properties passed into the evaluator
...
fallbacks to values from the qt we were compiled/linked against really
make no sense.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
2a4ef827a9
inject QT_VERSION into the evaluator
...
almost too simple to be right, given the TODO ...
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
f6f8340b8e
improved high-level qmake compat
...
- parse .qmake.cache, remove workaround for not doing it
- look for the mkspecs in all the places qmake would do
- use the passed in properties instead of QLibraryInfo to find the qt
data dir
- fix loading of generic features from within os-specific ones with the
same name
- add multiple inclusion guard for features (including what seems to be
a bug in qmake ...)
- misc cleanups and beautifications
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
dfcf9889a7
look only for mkspec features for the current target platform
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
6b85d482b6
micro-optimizations
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
bcda15ee97
fixEnvVariables => expandEnvVars overload
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
0d0860a0be
set the current work dir even for pri files
...
qmake does so.
of course, in the longer run we need to get rid of this at all, but this
would require quite some reviewing of side effects.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
980868cee4
make the qmake option object a proper member
...
to be able to share the option object among evaluators, it is passed by
pointer.
only field_sep stays static and becomes a string - that's effectively
just a cache to avoid repeated construction.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
3739af6c46
make Option a nested class of ProFileEvaluator
...
it's still static at that point, though.
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
c699522bf9
shuffle code around
...
non-inline implementations in a header? feh!
2009-08-04 20:59:28 +02:00
Oswald Buddenhagen
3399e362cc
inline trivial functions
2009-08-04 20:59:27 +02:00
Oswald Buddenhagen
9431850fcd
remove remainders of a fairly useless set of asserts
...
(the rest seems to have evaporated over time or never existed in the
first place)
2009-08-04 20:59:27 +02:00
Oswald Buddenhagen
5b7c8848e5
don't push top level pro file twice on stack
2009-08-04 20:59:27 +02:00
Oswald Buddenhagen
023affc603
get rid of m_origfile
...
it's redundand
2009-08-04 20:59:27 +02:00