feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
6,053 Commits 108 Branches 368 Tags
8adef29bf61ed55c045e53b5c81cc038a82ad57d
Commit Graph

88 Commits

Author SHA1 Message Date
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
dt
3c6bb2429a Unbreak the cmake plugin for the 1.2 release 
Last minute show stopper bug, this only affects cmake projects, so it
should be safe.

Reviewed-By: Trust me
 2009-06-17 11:56:49 +02:00
con
2919c21007 Cherry-pick: Update license headers and sales contact details. 
Reviewed-by: Trust Me

Conflicts:

	src/libs/cplusplus/CppBindings.cpp
	src/libs/cplusplus/CppBindings.h
	src/libs/cplusplus/FastPreprocessor.cpp
	src/libs/cplusplus/FastPreprocessor.h
	src/plugins/cpptools/cppcurrentdocumentfilter.cpp
	src/plugins/cpptools/cppcurrentdocumentfilter.h
	src/plugins/cpptools/cppsemanticsearch.cpp
	src/plugins/cpptools/cppsemanticsearch.h
	src/plugins/duieditor/parser/qmljs.g
	src/plugins/duieditor/parser/qmljsast.cpp
	src/plugins/duieditor/parser/qmljsast_p.h
	src/plugins/duieditor/parser/qmljsastfwd_p.h
	src/plugins/duieditor/parser/qmljsastvisitor.cpp
	src/plugins/duieditor/parser/qmljsastvisitor_p.h
	src/plugins/duieditor/parser/qmljsengine_p.cpp
	src/plugins/duieditor/parser/qmljsengine_p.h
	src/plugins/duieditor/parser/qmljsgrammar.cpp
	src/plugins/duieditor/parser/qmljsgrammar_p.h
	src/plugins/duieditor/parser/qmljslexer.cpp
	src/plugins/duieditor/parser/qmljslexer_p.h
	src/plugins/duieditor/parser/qmljsmemorypool_p.h
	src/plugins/duieditor/parser/qmljsnodepool_p.h
	src/plugins/duieditor/parser/qmljsparser.cpp
	src/plugins/duieditor/parser/qmljsparser_p.h
	src/plugins/duieditor/parser/qmljsprettypretty.cpp
	src/plugins/duieditor/parser/qmljsprettypretty_p.h
	src/plugins/duieditor/rewriter/rewriter.cpp
	src/plugins/duieditor/rewriter/rewriter_p.h
	src/plugins/duieditor/rewriter/textwriter.cpp
	src/plugins/duieditor/rewriter/textwriter_p.h
	src/shared/cplusplus/ASTClone.cpp
	tests/manual/cplusplus/main.cpp
 2009-06-16 17:26:44 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
dt
10151809c4 Add Environment settings to CMakeRunConfiguration 2009-05-27 18:33:50 +02:00
dt
adc7a7204b Use the environment specified for the current build configuration to 
rebuild the cbp file

I think that makes sense, we'll see.
 2009-05-27 14:58:11 +02:00
dt
14a79dad58 Simplfy API of CMakeOpenProjectWizard remove some left over QStringList 
We don't call it with a list anymore, so make it just a QString
 2009-05-27 14:58:07 +02:00
dt
0bda19a099 Add the ability to set a build environment also for CMake projects. 
Note: as for qt projects, this is also used for running. And we don't
use it for running cmake yet.
 2009-05-27 14:58:02 +02:00
dt
72f5be29a2 Support multiple buildconfigurations with cmake 
We didn't support having different build directories.

Task-Nr: 251632
 2009-05-18 18:07:52 +02:00
dt
84ee1653f4 Allow changing the build directory, and reparse. 
Task:  250418

This also moves us closer to supporting multiple build configurations
properly.
 2009-04-20 17:59:36 +02:00
Oswald Buddenhagen
6d5eeb7afb add missing tr()s, etc., add some //: comments 2009-04-20 16:51:10 +02:00
dt
d0159d7c7c Small tweaks to the cmake open project wizard. 
Note: The use is now forced to run cmake. This is rather suboptimal, but
currently cancel doesn't do the correct thing so we prevent that.
 2009-04-15 16:22:55 +02:00
dt
0a406dbe1f Add a makestep that cleans up 
Make clean and rebuild all work.
 2009-04-07 15:00:16 +02:00
dt
3b6d8b8f4d Add the ability to add Runconfigurations for cmake-targets we know about 
Task: 250415
 2009-04-06 17:01:26 +02: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
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
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