Commit Graph

107 Commits

Author SHA1 Message Date
Tobias Hunger
4ee223d45d Add a id() method to projects
* This makes it easier to distinguish projects in the
   userfileaccessor
2010-02-01 12:23:14 +01:00
dt
28d021a30f Code style 2010-01-20 18:17:31 +01:00
Tobias Hunger
b1e1f44a8d Add method to verify existence of CMake targets
* Add a simple method to test whether a CMake target exists.

Reviewed-by: dt
2010-01-14 15:51:49 +01:00
Tobias Hunger
592e494d1a Fix typos
Reviewed-by: thorbjorn
2010-01-11 10:26:13 +01:00
dt
fec96d4c4a Fix cleaning of CMake projects 2010-01-08 13:54:18 +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
14eb1f66e9 Remove BuildConfiguration::setValue/value 2009-12-08 17:59:21 +01:00
dt
b63e6e939d Make BuildConfiguration::setValue and ::value protected 2009-12-07 15:55:41 +01:00
dt
24a4590767 Cmake: Let the generator determine the toolchain
Otherwise we need to parse the cbp file, which happens only if the
buildconfiguration gets active. Also try to decouple a few internals a
little bit by using signals. The CMakeProject still handles a few things
directly instead of via signals, more to come eventually.
2009-12-07 15:00:17 +01:00
dt
a741261f10 Fist set the display name then addBuildConfiguration on clone 2009-11-30 15:24:33 +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
dt
7904544b84 Remove BuildConfiguration::name()
The pointers can be used to distinguish BuildConfigurations
2009-11-30 15:24:31 +01:00
dt
60a1ee12ba Remove project() from BuildStep
The project() should in most cases not matter, instead the
BuildConfiguration should. This shows all the information that needs to
move into the BuildConfiguration classes.
2009-11-30 15:24:31 +01:00
dt
20214787d1 Add BuildConfiguration::restore and BuildConfiguration::project()
More API work.
2009-11-30 15:24:31 +01:00
dt
ae633c1956 Add BuildConfiguration classes
Each project has it's own BuildConfiguarion * classes, they'll get a
decent type safe interface and the setValue/value stuff will be removed.
2009-11-30 15:24:31 +01:00
dt
0d162be22f Make BuildSteps one instance per BuildConfiguration
Enables users to change which buildsteps get run per buildconfiguration.
Some further tweaks are probably necessary. This is a rather big
change, though it should work. :)
2009-11-19 16:36:48 +01:00
dt
72fe54db77 Remove value(name) and setValue(name, value) from BuildStep 2009-11-19 16:35:19 +01:00
dt
10a0647ddf Remove QSharedPointer<> for RunConfiguration 2009-11-19 16:35:18 +01:00
con
fa34847571 Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/qt4projectmanager/qt4project.cpp
2009-11-03 18:08:01 +01:00
dt
c8e7df16eb Show a cancel button in the opening cmake projects wizard.
Allows the user to change his mind. :)
Reviewed-by: Friedemann Kleint <qtc-committer@nokia.com>
2009-11-03 14:37:34 +01:00
con
68f193a189 Merge commit 'origin/1.3'
Conflicts:
	src/plugins/debugger/gdb/gdbengine.cpp
Needed changes:
        src/plugins/qt4projectmanager/qtversionmanager.cpp
2009-10-27 18:23:58 +01:00
dt
cb5a93ff49 Fix "Add New" using the wrong directory for cmake projects 2009-10-27 17:27:59 +01:00
dt
cfc7040ede The qtversions's toolchain now depends on the actual compiler not mkspec
That is we actually parse the mkspec and evaluate QMAKE_CXX (and a few
other variables) to figure out the correct mkspec. This makes using
custom mkspecs easier and is also cleaner. I also changed mkspec() and
mkspecPath() to behave a little diffrent, essentialy mkspec() will
return only the name (the actual dir name) of the mkspec. That is in
general not sufficient for passing on to qmake. mkspecPath() only
returns the correct path to mkspecs/default.
Hopefully I haven't broken WinCE/Maemo/MinGW.
2009-10-22 14:39:00 +02:00
Friedemann Kleint
c5633d0840 Warning/Compile 2009-10-01 14:56:29 +02:00
con
4c199a3ca0 Fix problem when canceling cmake build configuration wizard. 2009-10-01 10:05:06 +02:00
con
92b905a6f2 Build configuration factory now adds configurations directly.
It's easier this way for the unique naming.
2009-10-01 10:05:06 +02:00
con
a16806353a Remove string identifier from setDisplayNameFor and setUserEnvChanges. 2009-10-01 10:05:06 +02:00
con
382750c8a3 Remove Project::(set)Value(buildconfig, ...) methods.
Instead use the BuildConfiguration class methods directly.
2009-10-01 10:05:06 +02:00
con
acbd4513e3 Changing string based api to BuildConfiguration based api.
Builds, but I'm pretty sure it doesn't *work* :)
2009-10-01 10:05:05 +02:00
dt
84b3f0af7b Fix a wrong check for the modification date for cmake projects.
Now it should finally ask to regenerate in all circumstances. (If you
are using CMake from cvs.)
2009-09-23 15:28:12 +02:00
dt
45de01ee73 Remove wrong comment 2009-09-23 15:07:29 +02:00
dt
fba7d76936 Canceling the wizard for a new cmake build configuration still created.
Made virtual newBuildConfiguration return a bool
2009-09-23 15:00:02 +02:00
dt
f291b669c3 Actually watch all the project files of a CMake project.
And react to changes to one of them.
2009-09-14 16:09:17 +02:00
dt
e1ffc90055 Only add the "all" target if the cbp file actually has a all target 2009-09-14 14:31:13 +02:00
dt
e58ff77bd3 Take the build environment into account for searching what to execute.
Fixes a bug where the cmake plugin wasn't finding make, if the make
commands directory was added to path in the build environment.
2009-09-08 13:53:50 +02:00
dt
9f91842813 Compile without rtti support
Since we can easily do that, just do it. No gurantee that we aren't
going to use rtti in the future.
2009-08-27 12:12:35 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
dt
109cb04102 Fix CMake Project to work with new project settigns pane. 2009-08-06 17:30:49 +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
f90e37152a Give the correct file type to .qrc files for cmake projects
Fixes a designer integration issue.
Task-Nr: 258315
2009-07-27 12:20:16 +02:00
con
2afea9ddf5 CMake project settings margins and field growths. 2009-07-23 17:23:26 +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
dt
4d11487a86 Harcode that on windows the gcc toolchain defaults to make instead of
mingw32-make.exe
2009-07-03 19:06:00 +02:00
dt
723d90c51d Fix updating the codemodel for cmake on switching buildconfigurations
That is we update all files with the new include and defines if we are
switching toolchains.
2009-07-03 18:56:48 +02:00
dt
e524f52477 Allow restoreSettings() to fail,
E.g. cmake pops up a wizard then, the running of cmake can fail though.
Now you don't end i[ with a empty project then. The error reporting in
that case is not yet optimal.
2009-07-03 16:46:01 +02:00
dt
40ff6ab2c4 Make msvc and cmake play together.
Note: This requires a cvs cmake and is not fully tested yet. This adds a
few missing pieces, so now opening new never built projects without a
.user file on systems with just one VS installation should work.
2009-07-02 16:44:51 +02:00
dt
7debdc2b75 Add all cmake files to the project tree
That is if using a cmake that outputs enough information. The necessary
patch for that was commited to cmake's cvs recently by Alexander
Neundorf.

Task-Nr: 250399
2009-06-30 17:38:27 +02:00
con
d7dbb27f0d Merge commit 'origin/1.2' 2009-06-19 10:19:05 +02:00
dt
2d65dec3e9 Add a toolChainType() method to the ApplicationRunConfiguration.
Best effort only though. This can make detection in the debugger which
engine should be used easier.

Task-Nr: 256161
2009-06-17 19:06:17 +02:00