Commit Graph

94 Commits

Author SHA1 Message Date
Thorbjørn Lindeijer
73a5bd479f Fixed indentation of InternalNode 2010-02-26 16:14:11 +01:00
Friedemann Kleint
13a608f86f uic-Codemodel-updating: Decouple form editor.
Pass around contents as string, saving repeated
invocation of FormWindowEditor::contents().
Remove dependency to FormWindowEditor.
Reviewed-by: dt <qtc-committer@nokia.com>
2010-02-26 14:55:39 +01:00
Robert Loehning
6639da4df5 Don't crash when pro-file is empty.
Reviewed-by: Oswald Buddenhagen
2010-02-24 16:26:08 +01:00
con
e0a12e9e2c Show native file paths in category sub-folder nodes.
Correctly show
* Headers
   * C:\foo
instead of
* Headers
   * C:/foo
2010-02-24 15:48:52 +01:00
con
8c6fc0c454 Don't begin global paths with '/' on windows.
Doing it creates huge delays, because it resolves to a network path.
Also rename FolderNode::setFolderName to FolderNode::setDisplayName,
because that's the name of the property.

Task-number: QTCREATORBUG-695
2010-02-24 15:06:48 +01:00
dt
75545a2bf0 Fix FileManager to correctly handle multiple IFile's for the same file
And port the Qt4ProjectManager to use that API for synchronization
between editors and the .pro file tree.

Reviewed-By: con
2010-02-17 16:51:02 +01:00
Friedemann Kleint
04462a4eb5 Qt4ProjectManager: Fixed static storage of Icons.
suppressing the "~QX11PixmapData(): QPixmap objects must be destroyed
..." warning.
2010-02-12 12:40:32 +01:00
Tobias Hunger
d1bdfcc363 Integrate target support
* Ease cross device development by introducing 'targets' which
   group build- and runsettings that are valid for this one target

 Most of the kudos for the code review go to dt. Con, thorbjorn,
 ckandler and others did also review parts of this patch.

Reviewed-by: dt
2010-02-09 16:57:37 +01:00
Friedemann Kleint
81f14bb270 Fix some code scanning issues.
QString: Use QChar/char where appropriate, do not use QString::null
2010-02-02 17:09:41 +01:00
Tobias Hunger
5173c2dc01 s/target/buildtarget/ in projectnodes
This is in preparation of the addition of "targets" in the sense
of "platforms to develop for" into the codebase.

Reviewed-by: dt
2010-02-02 12:59:29 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
bf10b04f7f don't guess .pro file names for SUBDIRS targets
qmake doesn't, either
2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
6c7b2d1c87 actually edit pro files instead of rewriting them from the "AST"
that way the file formatting is better preserved.
2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
93b6820e8c paths in .pri files are still relative to the .pro file's directory 2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
95a9b64c4a don't mess up report about failures when removing multiple files 2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
69028643b2 remove evaluation of pro file before changing it
just parsing it (once ...) ought to be sufficient. we don't need to
validate the syntax beyond that anyway.
2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
ea9c5efa15 save possible modifications to pro file *before* re-reading it ... 2010-01-25 16:53:56 +01:00
Oswald Buddenhagen
cc709e963e purge unused "modified" flag from ProFile 2010-01-25 16:53:55 +01:00
dt
d8188399cf Remove ProjectExplorer::FileWatcher usage from Qt4ProjectManager
Use the filemanager instead
2010-01-20 14:47:52 +01:00
Oswald Buddenhagen
5ab250fe57 purge ProEditorModel and ProCommandManager
they were remnants of the pro editor, which was removed long time ago.
they were still used for automatic editing of pro files, but were
totally overengineered for that purpose (removed 1300 LOC, added 40).
2010-01-12 16:08:37 +01:00
dt
60c8686ed8 Add the precompiled headers to the project info
QMake passes those headers directly to gcc, so the user doesn't need to
include themselves.
2010-01-12 13:19:15 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +01:00
dt
b661cb9992 Improve performance, keys() is slow.
Reviewed-By: Roberto Raggi <roberto.raggi@nokia.com>
2009-12-10 12:09:46 +01:00
Oswald Buddenhagen
f9d955eb6c cache parsed pri & prf files
no point in re-parsing them over and over during the scan of a bigger
project ...

shaves off another 20% of the loading time of Qt 4.6.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
ef660880ad make ProFileOption persist during the scan of an entire project
there is no point in throwing away and re-recreating invariant data over
and over ...

shaves off ~15% of the load time of Qt 4.6.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
3657acac5f move various functions from Qt4PriFileNode to Qt4ProFileNode
findProFileFor(), buildDir() and createProFileReader() make sense only
in relation with an actual pro file anyway, so move them there.
2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
b4e7500dbe remove needless conditionals 2009-12-08 17:36:41 +01:00
Oswald Buddenhagen
050b2e4ae2 join the two node update lists into one list of pairs
this is probably just as fast (still two allocs per insert), but it is
definitely more elegant.
2009-12-08 17:36:41 +01:00
dt
1e46cb424e Rework connections on the project pane for Qt4Projects.
Should fix a lot of corner cases, might introduce a few bugs.
Also rename functions/slots to be better named.

Generic Project Manager and CMake Project Manager are missing from this
patch.
2009-12-07 15:00:17 +01:00
Oswald Buddenhagen
5628f945fb Merge remote branch 'origin/1.3' 2009-12-04 21:20:20 +01:00
Oswald Buddenhagen
e408159bfe plug memory leak 2009-12-04 21:18:30 +01:00
Friedemann Kleint
087e72499e Designer: Prepare re-implementation of "Goto Slot".
...making use of the new code model features. Move code to
separate file. Make it possible to obtain path to generated
header file from project manager.
2009-12-03 16:23:15 +01:00
dt
801e9948f5 Hide static cast in accessor methods 2009-11-30 15:24:32 +01:00
dt
a312206306 Move most of the BuildConfiguration specific functions
Note: I didn't fix all the connects and there are a few missing things.
This compiles, more work is coming.
2009-11-30 15:24:31 +01:00
con
e237036e03 OBJECTIVE_HEADERS for pro parsing and syntax highlighting. 2009-11-24 19:13:37 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
2009-10-05 11:06:05 +02:00
Friedemann Kleint
74a3828f19 Purge out include files in exported headers 2009-10-01 16:38:08 +02:00
Oswald Buddenhagen
f7d665ba42 remove dead code 2009-09-29 12:18:42 +02:00
con
97b2e77c00 Fix crash when completely removing a file type from pro file.
The wrong category folder (like Sources/Headers) would be deleted from
the project tree, because all category folders had the same path.
The nodes' path is used everywhere for performance optimization.
2009-09-22 13:35:39 +02:00
con
f7874bb65f Uninitialized value in new project tree structure. 2009-08-25 16:25:17 +02:00
con
7ebea974d6 Show pro file's subdirectory structure in project tree in non-simple mode.
Also adding category folders for the different file types
(source files, header files, resource files, form files, other files).
2009-08-21 14:53:25 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
12981d0c6b Fix not showing all files 2009-08-10 15:11:27 +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
dt
eb07777af6 Remove QBuild stuff that was never finished. 2009-07-27 12:50:42 +02:00
Alessandro Portale
d3f9757916 Removing some unused semicolons after Q_UNUSED
There were both variants, with and without extra semicolon.
2009-07-13 17:35:17 +02:00
Oswald Buddenhagen
a2f40fce2a implement proper vpath handling for qt4 projects
this also removes the bogus special casing of various
filename-containing variables inside the pro parser.
2009-07-10 14:04:48 +02:00
Stian Sandvik Thomassen
9ebba84bfe Prevented project's existing .pro file from being added to project
A project's existing .pro file could be added to the project, making
the .pro file appear twice in the project tree. This is sub-optimal
because

1. It does not make sense for the .pro file to appear twice.
2. Qt Creator crashes when trying to remove either of the duplicate
.pro files.
2009-07-09 14:52:07 +10:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00