Commit Graph

3443 Commits

Author SHA1 Message Date
Oswald Buddenhagen
deff5ac20f re-use pre-existing builds
run "cmake . [...]" if a build already exists in the build dir. this
saves the user from reproducing all the arguments he may need.

on the downside, this will go utterly awry if the source dir of the
existing build is a different one than known to creator. this should be
a rather rare corner case, so ignore it for now. the nice solution would
be a checkbox (on by default) to request this new behavior.
2009-03-27 20:57:12 +01:00
Oswald Buddenhagen
cd93d9e3dd make changing the build dir of a shadow build work 2009-03-27 20:57:12 +01:00
dt
ae1df70cfc Adds the source top level directory explicitly to the include paths.
It wasn't listed in the cbp file, so add it since cmake does that too.
2009-03-27 12:15:20 +01:00
dt
145c1fb94d Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-03-26 17:38:18 +01:00
dt
0a2df32654 Pop up a dialog if the CMakeCache.txt changes.
Rerun cmake and reparse the file. Add new files to the tree, remove old
ones from th tree. Add/removing targets should also work.
2009-03-26 17:36:58 +01:00
mae
62dd2a5acb Compile without warnings 2009-03-26 15:33:32 +01:00
dt
5a97436c0c Add a argument line edit for the cmake runconfiguration.
Even works.
2009-03-25 18:29:42 +01:00
dt
74974a5a58 Also use the dumper library code from the cmake plugin.
Adds a little bit of code duplication, don't currently know how to best
avoid it, so I'll leave that for now as is. To be tested once Andre
pushes his stuff.
2009-03-25 17:30:48 +01:00
dt
e21a74cb35 Change the way the debugging library is build and found, yet again.
We used to build a helper library as part of the project. First with the
qmake -after SOURCES= stuff and after until now with the
gdbmacrosbuildstep. Now, the all new and fancy integretation directtly
into the qt version dialog. You build the debugger library once for
each qt version and then it's there ready to be loaded into each
project build against that qt version. Saves a lot of time.
And makes it possible to also load that library into while debuggign a
cmake project. (Need to hook that up now.)
Unfourtanetly this breaks the custom dumpers if you use a custom run
executable.
2009-03-25 15:18:37 +01:00
Thorbjørn Lindeijer
71aeac5915 Use completeBaseName instead of baseName where appropriate
Fixes issues with handling additional dots in the filename in many
places.

Task: 246390
2009-03-20 17:04:23 +01:00
Thorbjørn Lindeijer
b789ffa91b Added and corrected copyright headers 2009-03-20 14:59:12 +01:00
Thorbjørn Lindeijer
cc995d13ee Allow updating of configuration or file list separately
Now it will only update the list of files when you edit [project].files,
and only reparse all files when you edit [project].config or
[project].includes. When updating the file list it will only parse the
added files.
2009-03-19 18:08:16 +01:00
Thorbjørn Lindeijer
e72e07963d Initialize run mode correctly
It was missing for CustomExecutableRunConfiguration and
Qt4RunConfiguration.

Reviewed-by: dt
2009-03-18 17:53:20 +01:00
Friedemann Kleint
bccf4a1fc3 Fixes: Introduce a cpp settingspage containing file naming conventions (lower case and suffixes). Reorder VCS settings pages.
Task: 241959, 248085

RevBy: Optics/Naming checked by con
Details: Give IOptionPage an id() to differentiate from trName(). Make showOptionsDialog return a bool (applied) and give it an optional parent. Change Cpp and form class wizards, give them a Configure... button to change those settings.
2009-03-18 16:43:01 +01:00
Thorbjørn Lindeijer
78d603adec Use the make command defined by the tool chain
For now only for GenericProject, since the CMakeProject doesn't have the
right tool chain set on Windows yet.

Reviewed-by: dt
2009-03-18 14:35:35 +01:00
Thorbjørn Lindeijer
3904b2ad3e Class name simplification for MakeStep related classes
Was a bit confusing that a MakeStep was constructed by a
MakeBuildStepFactory and configured by a MakeBuildStepConfigWidget.

The MakeStep of the generic project manager was renamed to
GenericMakeStep.
2009-03-18 13:55:13 +01:00
Thorbjørn Lindeijer
93b3dda602 Fixed member variable prefix to be in line with coding standards 2009-03-18 12:20:06 +01:00
dt
00951b6b96 More progress on the CMake plugin
Made the cmake plugin even more usable by implementing:
Pop up a wizard if there is a .user file but no .cbp file. (Fixes empty
project reported on irc.)
Pop up a wizard if the .cbp file is older then the CMakeLists.txt file,
thus reparsing the file. (Note: There is a bug that we need to actually
also check the last modified of all included files.)
Reparse the cbp file to add new RunConfigurations / delete no longer
existing RunConfigurations and update those that have changed.-
Show a nicer title in the Projects/RunConfiguration pane
2009-03-16 17:33:05 +01:00
dt
7fef10810a Fixes: All cmake projects use CMakeLists.txt as the name
Task:     246282
Details:  call setFolderName()
2009-03-13 15:46:30 +01:00
dt
c3dcfeafba Fixes: Make CMakeProject a friend of CmakeProjectNode
Details:  Makes sense removes a few using declarations.
2009-03-13 15:45:30 +01:00
dt
3006495403 Fixes: Make opening complex projects 6 times faster.
Details:  Optimize addFileNodes and addFolderNodes. Probably has no
effect for qt4projectmanager.
2009-03-13 13:55:59 +01:00
dt
b2ee911e1a Fixes: Add a linedit for make arguments for the cmake makestep.
Details:  One of the more common simple wishes, so just implement it.
2009-03-12 15:51:44 +01:00
dt
d73ac37b8a Fixes: Use the correct generator/make for MinGW
Details:  Patch by Antoine Requet
2009-03-10 11:48:37 +01:00
dt
488b04aa39 Fixes: Uninitialized value of m_buildParser
Details:  Patch by Antoine Requet
2009-03-10 11:47:23 +01:00
qtc-committer@nokia.com
f2550c2ca7 add forgotten files 2009-03-10 09:39:40 +01:00
dt
ef1693e9a3 Fixes: Add a smarter cmake open project wizard.
Details:  That fixes a few bugs, while still having a few missing
things. Don't allow the user to set a shadow build directory, if there
is already a in source build. Detect if a cbp file is already existing
and recent enough, don't rerun cmake then. Ensure that the user runs
cmake with the cbp generator on opening the project. Show the output of
the cmake generator while running. Remove the unecessary cmake step.
2009-03-09 18:13:19 +01:00
Daniel Molkentin
a155cec18f Fixes: Bump Creator version after release
Task:     -
RevBy:    Thorbjorn
AutoTest: -
2009-03-04 12:46:05 +01:00
dt
8897284189 Fixes: Show the CMakeLists.txt file in the navigation widget and completion
Task:     CMake support
Details:  No syntax highlighting
2009-03-03 19:03:39 +01:00
Oswald Buddenhagen
2593c7798e Merge commit 'origin/1.0.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/qt4projectmanager/qt4project.cpp
	src/tools/qpatch/qpatch.cpp
2009-03-02 12:28:01 +01:00
Oswald Buddenhagen
df8ffb09fd add "run in terminal" options 2009-02-27 18:04:36 +01:00
con
0be29685a3 Fixes: - New license, new website. 2009-02-27 15:09:44 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
hjk
84c82a669b Fixes: change license headers to LGPL 2009-02-25 09:02:17 +01:00
Oswald Buddenhagen
3fcb20d6bb Merge branch '1.0.0' into master-master
Conflicts:
	src/plugins/debugger/debugger.pro
	src/plugins/debugger/gdbengine.cpp
2009-02-24 15:15:39 +01:00
con
523f74e838 Fixes: - Updated version number 2009-02-24 12:29:27 +01:00
Oswald Buddenhagen
3fca94780a Merge branch '1.0.0' into master
Conflicts:
	src/plugins/debugger/gdbengine.cpp
2009-02-23 17:03:25 +01:00
dt
469639fb3c Fixes: Make QtCreator fly even in face of perforce misconfiguration.
Details:  If p4 is in path, but the server isn't configured correctly we
were pretty slow, this fixes that by running p4 client -o after the
settings have changed, if that doesn't return after 2 seconds, then we
cache that as a invalid configuration.
2009-02-19 16:29:52 +01:00
dt
c6a02170b9 Fixes: Move Buildparser to the projectexplorer, use in cmakeplugin
Details:  This enables us to parse the build errors correctly.
          The makesteps of the qt4project and cmakeproject have some
          code dupliaction, which could be refactored. And the code
          to find out the correct build parser could probably also
          be done better, but we are now parsing the build output for
          cmake.
2009-02-16 13:12:12 +01:00
dt
04805e0a9e Fixes: Use the toolchain classes int the cmake plugin.
Details:  We now get the system includes and system defines.
2009-02-11 12:16:36 +01:00
con
bbca68fbb9 Fixes: - Copyright date 2009-02-04 11:15:28 +01:00
dt
3b930e1eda Fixes: Add copyright header to cmakeconfigurationwidget.h and cpp 2009-01-23 18:54:46 +01:00
dt
7f614f1ae0 Fixes: Add missing file. 2009-01-23 18:30:21 +01:00
dt
e8e2e4f45d Fixes: Progress to the cmake plugin
Details:  Add a dialog asking for command line options and build
directory. This dialog pops up if you don't have a .user file. Note,
though that it also pops up if there is already a in source build.
(The build directory lineedit should be read only then.)
The cmake button in that dialog and the output pane need more polish to
make them better. With those changes you can now build and run marble
from Qt Creator. (For marble you need to pass a few options to cmake.)

Also add a configuration page to the Tools/Options dialog, where you can
specify the cmake executable path.

And add a class which runs cmake in the background to find out which
version and wheter that cmake version has Qt Creator generator. (Which I
did begin to write.)
2009-01-23 16:57:38 +01:00
dt
e97889c782 Fixes: Remove ui file from pro file. 2009-01-22 11:56:52 +01:00
dt
3bcbd0782b Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline 2009-01-22 11:37:43 +01:00
dt
38471eebfe Fixes: Run cmake to get the version and check for the QtCreator generator
Details:  We don't act on that information yet.
2009-01-21 17:21:59 +01:00
dt
db20c44d40 Fixes: Add a settings page to the cmake plugin.
Details:  There's a linedit on there, we restore and save the settings,
only thing missing is actually using it.
2009-01-21 16:25:21 +01:00
Thorbjørn Lindeijer
6adecf3767 Avoid going through ICore when it's not necessary
Many singletons have their own instance() method, in which case there is
no need to use ICore::instance() to get access to them.
2009-01-21 15:55:33 +01:00
hjk
113b81e9db replace ExtensionSystem::PluginManager::instance()->getObject<Core::ICore>() by Core::ICore::instance() 2009-01-20 11:52:04 +01:00
hjk
cc5ff1ec74 Remove #include <extensionsystem/pluginmanager.h> from icore.h, a
forward declaration is sufficient.
2009-01-19 12:39:20 +01:00