Commit Graph

158 Commits

Author SHA1 Message Date
hjk
ebcd992577 Rename namespace Qt4ProjectManager to QmakeProjectManager
First step towards plugin renaming.

Change-Id: I8ac017660a7aa2bda0d7bb7d72ab0cfceaf6cfd2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-16 12:09:59 +02:00
Yuchen Deng
4f82c36a19 Move QtVersionFactory to QtSupport module
After this is done, QbsProjectManager/CMakeProjectManager will be able to
have full Qt support work without having to depend on Qt4ProjectManager.
It's should belong here.

Change-Id: I577d47cb8a40eb697aa862fbec36c56ff05004f0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-15 16:18:32 +02:00
dt
67cfb7e078 Qt4projectManager: Refactor Qt4Target, split up in per target classes
Almost(*) all of the symbian and maemo specific code is now theoretically
moveable to a separate plugin. Thus making it possible to implement
new targets in a plugin.

(*) Noteable missing is the qtversion, which needs to be split up
per target too.

Also fixes
Task-Nr: QTCREATORBUG-2440

Reviewed-By: hunger
Reviewed-By: ck
2011-01-17 14:13:40 +01:00
Tobias Hunger
6b92bc3d13 Clean up environmentmodel/widget
* Move the environment model code to utils and export it
 * rename the environmenteditmodel files to environmentwidget
   (which is the class they actually contain)

Reviewed-by: dt
2011-01-13 12:21:45 +01:00
con
d1023c7614 It's 2011 now.
Reviewed-by: hjk
2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1'
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
Friedemann Kleint
ca4e8ae091 Compile warnings. 2010-12-14 16:54:06 +01:00
dt
84b80198b9 Qt4ProjectManager: Fix disabling runconfigurations on parse
Turns out to be a oversight
2010-12-10 19:02:38 +01:00
dt
591ac2c3dd Qt4ProjectManager: Fix Qt4RunConfiguration::isEnabled()
Reviewed-By: hunger
2010-12-07 16:39:48 +01:00
Tobias Hunger
7169bfff39 Symbian: Introduce RVCT 4 toolchain
Task-number: 2481
2010-11-26 15:07:39 +01:00
Tobias Hunger
2e09df3d9c ToolChain: Rename RVCT toolchains to RVCT2
Reviewed-by: dt
2010-11-26 15:07:37 +01:00
Oswald Buddenhagen
79be54ed8c replace env variable injection with pervasive expando support
do not inject SOURCEDIR and BUILDDIR into the environment of
build steps and run configurations any more.
instead, all custom executable paths, argument lists and working
directories now support the %{sourceDir} and %{buildDir} macros.
this approach is more elegant and more scalable.
2010-11-17 13:19:08 +01:00
Oswald Buddenhagen
1e362b0f8b overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.

Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
2010-11-17 13:19:07 +01:00
Oswald Buddenhagen
2fe83082dd don't maintain (and save) m_userSetWorkingDirectory
there is no point in doing it, as it is equivalent with
m_userWorkingDirectory being non-empty.
this code is consistent with CMakeRunConfiguration.
2010-11-12 16:17:47 +01:00
dt
a149b70fc6 Qt4ProjectManager: Remove left over debugging output 2010-11-02 16:43:12 +01:00
dt
ff60fcf29f Revert "Revert "Qt4ProjectManager: correctly set parse state on restoring""
This reverts commit ae6dbf364b.
2010-11-02 16:43:11 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
hjk
ae6dbf364b Revert "Qt4ProjectManager: correctly set parse state on restoring"
This reverts commit b979d9f151.
2010-10-29 15:25:08 +02:00
Tobias Hunger
e02dae3efb Enable/disable RCconfig widgets in constructor 2010-10-29 13:43:28 +02:00
Tobias Hunger
b310a0fc0f Small fixes 2010-10-29 13:42:46 +02:00
dt
b979d9f151 Qt4ProjectManager: correctly set parse state on restoring 2010-10-29 12:23:32 +02:00
dt
0a5202d299 Qt4ProjectManager: correctly Initialize parse State for Qt4RC 2010-10-29 12:22:31 +02:00
dt
45dd1ad7f5 Disable Run Configurations while parsing .pro files
Initial patch and idea by hunger.
Reviewed-By: hunger
2010-10-28 16:09:41 +02:00
dt
2491038f57 Qt4ProjectManager: Fix wrong expannding
Reviewed-By: ossi
2010-09-30 20:13:39 +02:00
dt
218d2527fc Qt4RunConfiguration & CMakeRunConfiguration: Fix connects
Ups were wrong in the last commit
2010-09-27 18:14:33 +01:00
dt
99293bb204 RunConfigurations: Rename a few misnamed functions 2010-09-27 15:56:37 +01:00
dt
5adeb48e52 ApplicationRC: make exectuable() and co. return expanded values 2010-09-27 15:56:37 +01:00
Tobias Hunger
37c641e668 Use PathChooser::rawPath() where it makes sense 2010-09-24 16:35:08 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +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
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
Kai Koehne
6f11765dae Qml: Allow user to configure port used (all project types)
Reviewed-by: dt
2010-09-03 12:29:41 +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
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
Tobias Hunger
b6f1dbeeb0 Remove obsolete ways to set the display name
* Now that there is a generic way to rename configurations:
   Remove individual renaming methods from all over the codebase

Reviewed-by: dt
2010-08-24 16:04:51 +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
dt
7862e31256 Refactor OutputFormatter
Move link handling code to outputwindow from OutputFormatter

Move createOutputFormatter to the RunConfiguration

That makes it easier for Qt4RunConfiguration et all.
This also fixes that each time a runcontrol was rerun a new
OutputFormatter was created without deleting the old one, thus
increasing the memory usage.
2010-07-14 13:01:43 +02:00
ck
ad02e86e7a Qt4Projectmanager: Constify some member functions.
Reviewed-by: dt
2010-07-07 10:57:08 +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
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
dt
3de0668894 Linux icc parser
Reviewed-By: hunger
2010-04-12 15:05:11 +02:00
dt
9ddd7a59d7 Revert "Progress so far"
This reverts commit b1a121c54f.

Accidentally pushed the linux icc parser before it was ready.

Conflicts:

	src/plugins/qt4projectmanager/qtversionmanager.cpp
2010-04-08 10:49:20 +02:00
dt
b1a121c54f Progress so far 2010-04-07 13:51:07 +02:00
dt
a67e88993b Add LIBS-paths to PATH before running on windows.
On windows when linking to a library via -L/some/path, the library is
found in /some/path while linking. But running that app fails, since it
can't find the library. We now adjust PATH to include all paths from
LIBS and thus the library is found.
2010-03-29 15:17:19 +02:00
Tobias Hunger
1ca8cb2397 Introduce method to access the project directory
... use it.

Reviewed-by: dt
2010-03-25 14:21:43 +01:00
Friedemann Kleint
f66df7b9a6 Header cleanup in ProjectExplorer and Qt4ProjectManager 2010-03-17 17:45:33 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00