Commit Graph

3443 Commits

Author SHA1 Message Date
Tobias Hunger
747f750370 Set BUILDDIR and SOURCEDIR environment variables
Set BUILDDIR and SOURCEDIR in the build environment.

Reviewed-by: dt
2010-09-23 13:40:25 +02:00
dt
aa8e2e8e0f Allow relative paths in Build directories, Working Directories
Relative to the project's directory.
2010-09-17 15:32:41 +02:00
Leena Miettinen
0037296d70 Doc - Fix UI text capitalization to follow the KDE style guide.
Reviewed-by: dt
2010-09-15 10:30:51 +02:00
Lasse Holmstedt
dca859601f Fix misaligned debugger label in run configuration widgets
It was badly positioned esp. in OS X and Windows.
2010-09-10 17:27:08 +02:00
Friedemann Kleint
cb23999fbf Add error handling to QProcesses run at startup.
Give warnings about failures to be able to fix things/timeouts on
slow machines. Pass on arguments correctly on Windows.
Make sure processes are killed on timeouts.
2010-09-08 15:22:58 +02:00
dt
cfb79828cf CMake ProjectManager: Hide generated files
The heuristic to detect generated files is pretty basic and tries to
match the filenames against 3 patterns.

Task-Nr: QTCREATORBUG-2077
2010-09-07 18:34:40 +02:00
Kai Koehne
6f11765dae Qml: Allow user to configure port used (all project types)
Reviewed-by: dt
2010-09-03 12:29:41 +02:00
dt
5fae9b94c0 Cmake: Add a "Reconfigure project" to the Project Page 2010-09-02 13:57:35 +02:00
dt
160cf4096c Make sure we don't leave unconfigured Custom Executable RC laying around
Task-Nr: QTCREATORBUG-2222
2010-09-01 12:37:29 +02:00
Lasse Holmstedt
b935bca420 compile 2010-09-01 12:06:56 +02:00
Lasse Holmstedt
8c39471081 Debugger languages are now runconfiguration dependent
There's a UI in qml/customexec/cmake/qmake run configs for choosing the
debugger languages (C++ and QML). The default for all except .qmlproject
is only C++, so default debugging behavior is the same. However, if the
user wants to do simultaneous debugging with two languages, or only
debug QML, they can select the languages from Run Settings and it will
be remembered.

Reviewed-by: hunger
2010-09-01 11:35:36 +02:00
hjk
63bc8a0050 replace version 2.1.80 by 2.0.90 2010-08-30 10:38:38 +02:00
Tobias Hunger
715796b48a Fix krazy issues: Use explicit constructors
* Fix all warnings about non-explicit constructors except for those
   in 3rdparty code.
2010-08-27 12:10:29 +02:00
Jarek Kobus
1cefde9e45 Implement adding new project into opened subdirs project
Reviewed-by: dt <qtc-committer@nokia.com>
2010-08-26 18:35:05 +02:00
Tobias Hunger
616a9b13f0 Enable restoring the default names of project configuration items
* Enable support for this in all ProjectConfiguration items
   (Targets, projects, BCs, DCs, RCs, etc.). This is nicer
   than having custom code in individual configuraiton items.

Reviewed-by: dt
2010-08-24 16:04:51 +02:00
dt
b02add2490 Add QML folder in project tree, show files there
Use the full path for folders to sort in the project tree.

For virtual folders ensure that the path ensures the sorting we want.

Reviewed-By: kkoehne
2010-08-11 12:10:43 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
2010-08-02 14:21:05 +02:00
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
Roberto Raggi
8acde74d79 Forked QSyntaxHighlighter from Qt 4.7.
We need our very own syntax highlighter in Qt Creator.
2010-07-09 14:47:18 +02:00
dt
870da8e7e3 Make the build parser for custom build steps depend on the toolchain
The API addtition to BuildConfiguration of knowing of the default parser
is rather strange, but a necessary evil for this.

Reviewed-By: Thorbjorn

Task-Nr: QTCREATORBUG-514
2010-07-07 18:17:24 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
2010-07-06 18:36:30 +02:00
dt
dd0978796e Also make ProjectLanguage a proper context 2010-07-02 14:01:24 +02:00
dt
0801047287 Make project context a Core::Context
Also properly initialize m_projectContext in Qt4Manager, fixing the
disabled "Run QMake" action
2010-07-02 14:01:24 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context
A mostly mechanical change.

Reviewed-By: con
2010-06-25 12:58:07 +02:00
con
af44136e22 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
2010-06-24 11:40:22 +02:00
Friedemann Kleint
2a6f1df168 Fix MSVC10 compiler warnings.
Reviewed-by: dt
2010-06-21 12:05:54 +02:00
con
458a25efa9 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qt-html-templates.qdocconf
	src/plugins/qmldesigner/components/stateseditor/stateseditorview.cpp
	src/plugins/qmljseditor/qmljscodecompletion.cpp
2010-06-18 16:54:37 +02:00
Robert Loehning
77558abc32 Fixed translation of "Projects"
Reviewed-by: dt
2010-06-16 17:30:18 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
9250d0007d Version update to match the planned version naming. 2010-06-11 16:37:10 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
2010-06-11 16:30:39 +02:00
con
b0040dc858 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/projectexplorer/taskwindow.cpp
	src/shared/proparser/profileevaluator.cpp
2010-06-10 15:00:16 +02:00
dt
15f2e4e98d Don't reset build directory for clone cmake buildconfigurations 2010-06-10 14:50:21 +02:00
dt
9f86cfaf3c Cmake: Don't delete run configurations on switching buildconfigurations
Just disable them, but preserve them. This is different from qmake, but
for qmake we do have different assumptions what a buildconfiguration is.

Task-Nr: QTCREATORBUG-1591
2010-06-09 13:23:33 +02:00
con
d326c16747 Version bump. 2010-06-07 13:45:49 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules.
Reviewed-by: ossi
2010-05-14 15:53:56 +02:00
dt
9bc9fe73e1 File renaming
Reviewed-By: con
Reviewed-By: Friedemann Kleint

We now support renaming files. The version control system tries first to
rename, if that doesn't support or can't rename the file we do a normal
rename. (Note: git, hg, perforce > 2009.02 support renaming, cvs not.
(perforce untested)). We correctly notify all editors of the renamed
file and tell the project manager to rename the file in the project.

Note: Only the qt4projectmanager knows how to rename files.

Note: renaming folders, moving files to different folders, renaming
.pro/.pri files is not supported. Those things can be later added after
this has proven to work correctly in the simple case.

Also we don't do any actions based on the renaming like renaming
classes, changing include guards or #include lines.
2010-05-12 14:14:44 +02:00
con
3922be1b2e Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/texteditor/texteditoractionhandler.cpp
2010-05-11 13:39:21 +02:00
dt
910b86b9a4 Add a custom executable runconfiguration for cmake projects
That is for projects that don't have a runnable target otherwise.

Task-Nr: QTCREATORBUG-1363
2010-05-10 15:09:54 +02:00
con
84d9b647ee Version bump. 2010-04-30 11:58:05 +02:00
Erik
3ae3e3f330 Import library target from cmake project.
Added library flag to CMakeBuildTarget struct which is set when parsing
the cbp file. This flag is then used to make sure no runconfiguration
is created for library targets.

Merge-request: 136
Reviewed-by: dt <qtc-committer@nokia.com>
2010-04-26 12:30:02 +02:00
dt
f093d0806b Cancel code model indexing on project closing and full code model update
Task-Nr: QTCREATORBUG-1151
2010-04-26 12:29:50 +02:00
dt
baae85d579 make it possible to remove CMakeProject::MakeStep
Seems like nothing should be immutable.

Task-Nr: QTCREATORBUG-1161
2010-04-26 12:17:05 +02:00
Thorbjørn Lindeijer
2ab7d2eafc Some documentation comment formatting and a rename
Renamed RunConfiguration::configurationWidget to
createConfigurationWidget.

Reviewed-by: dt
2010-04-16 13:31:22 +02:00
Thorbjørn Lindeijer
662b27153d Removed redundant group boxes from options dialog pages
Reviewed-by: Jens Bache-Wiig
2010-04-13 17:33:36 +02:00
dt
a12daa6262 Change the build directory for cmake
It is now in the parent directory of the src directory.
Task-Nr:   QTCREATORBUG-1109
2010-04-12 17:39:59 +02:00
Tobias Hunger
5ba4773892 Fix parsing of CMake progress indicators
Reviewed-by: con
2010-04-01 15:29:03 +02:00
con
ded5ed975a Version bump 2010-03-31 18:06:02 +02:00