Commit Graph

310 Commits

Author SHA1 Message Date
Friedemann Kleint
562265d58c Toolchains: Header cleanup. 2011-02-28 16:50:14 +01:00
Friedemann Kleint
87423acca8 Polish target/toolchain warnings a bit. 2011-02-28 12:29:41 +01:00
Friedemann Kleint
88f333267f Fix Krazy code scanning tool warnings (QString, loops, spelling). 2011-02-25 15:28:01 +01:00
Tobias Hunger
4792715f20 Symbian: Allow for EPOCROOT and project to be on different drives
Allow for EPOCROOT and the project to be on different drives when
using SBSv2.

Task-number: QTCREATORBUG-3781
2011-02-24 17:54:09 +01:00
Kai Koehne
4b49d4f74c QtVersion: Rename 'debuggingHelper' to 'gdbDebuggingHelper'
Avoid confusion with other debugging helpers.
2011-02-24 13:45:39 +01:00
Kai Koehne
8b5f742fdf Qt Options Page: Remove gdb debugging helper status from tooltip
Listening all debugging helpers there is overkill, and one can see
their status conveniently anyway if the Qt version is selected.
2011-02-24 13:45:39 +01:00
Kai Koehne
d90d6729ad QtVersionManager: Small debugging output fix 2011-02-24 09:14:32 +01:00
Robert Loehning
4fc0839b37 Compile fixes 2011-02-23 19:10:09 +01:00
hjk
a8ae618d75 toolchain: fix enum naming style
Reviewed-By: Tobias Hunger
2011-02-23 17:56:33 +01:00
Tobias Hunger
3f4517f67f Qt: Detect Qt versions build with libinfix 2011-02-23 11:26:43 +01:00
dt
4440a3b726 QtVersionNumber: Fix crash
Checking the string for validity is not enough, actually bailing out if
it is invalid is better...
2011-02-22 17:36:10 +01:00
dt
06ee3aee7f Qt4ProjectManager: New TargetSetupPage
Rewrite the target setup page to look and baheve better.
Noteable better at:
- Disabling shadow building
- Deselecting whole targets
- Adding import directories

Api-wise, Targets derived from Qt4BaseTarget have two ways to customize
the targetsetuppage.

a) Reimplement availableBuildConfigurations
b) Leave createTargetSetupWidget and create(... Qt4TargetSetupWidget)
   in their default implementation. (Or only slightly customize like
   the desktop target does.)

Or:
a) Make a dummy implementation for availableBuildConfiguration
b) Replace createTargetSetupWidget and return your own widget
   (It should match the look and feel from the other widgets.)
   It needs to be derived from Qt4TargetSetupWidget
c) Also replace the create create(... Qt4TargetSetupWidget) function
   and set up the target anyway you want.
2011-02-22 15:35:24 +01:00
dt
a9963b6313 QtVersionManager: Introduce qtVersionNumber + various fixes
Make the internal data structure a map from id to Version, simplfing a few
functions. Return sorted lists, with newer versions in front for various
functions, e.g. validVersions(), versionsForTargetId.
2011-02-22 15:35:23 +01:00
Tobias Hunger
8d0c477245 ToolChain: Refactor toolchain support
Refactor ToolChains in Qt Creator:

 * Allow for several toolchains of the same type
 * Be smarter wrt. guessing what kind of output a toolchain
   produces. This allows us to eventually handle e.g. embedded
   linux setups way better than before.
 * Be smarter wrt. guessing what kind of environment a Qt version
   needs.
 * Improve auto-detection of toolchains a bit
 * Decide on which debugger to use based on the kind of output
   produced by the compiler.
 * Add options page to configure toolchains
 * Remove toolchain related options from the Qt version dialog

Reviewed-by: dt
2011-02-21 18:33:23 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00
Christian Kandeler
14cb9f91ad Make Meego target work.
- Package installation and running untested yet.
- User currently needs to adapt %files section in spec file manually.
  We expect this task to be automated by the build script in the future
  (see http://bugs.meego.com/show_bug.cgi?id=13148).
2011-02-01 14:08:12 +01:00
Christian Kamm
6b37fe19bc qmldump: Allow for debug and release versions and choose the right one.
Task-number: QTCREATORBUG-3549
Reviewed-by: Kai Koehne
2011-01-25 12:35:16 +01:00
Tobias Hunger
0f4d34ae96 Fix bogus warnings when creating a new project
Fix bogus warnings about build locations when setting up a new project.
2011-01-24 15:00:40 +01:00
Christian Kandeler
2ec85cc67a Maemo: Make some stateless functions static. 2011-01-19 11:07:14 +01:00
Christian Kandeler
f0a54abf6b Maemo: Introduce dedicated Fremantle and Harmattan targets.
Task-number: QTCREATORBUG-2770
2011-01-18 15:22:12 +01:00
Kai Koehne
0b74844474 Qt4Project: Clean up DebugHelperBuildTask
Make sure that the QtVersion object isn't referenced any more in
the separate thread: It might be deleted / altered while the thread is
running. Also let QmlDump use the class, instead of relying on it's
own implementation.

Reviewed-by: ckamm
2011-01-17 17:42:02 +01:00
dt
6422b1193f Fix last commit 2011-01-17 15:55:14 +01:00
dt
56a1e1099b Qt4ProjectManager: Do not loop endless if the defaöt mkspec is broken
Reported on irc.
2011-01-17 15:19:30 +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
hjk
bdb998eb3b qtversionmanager: initialize m_isBuildUsingSbsV2
Done by Milian Wolff
2010-12-14 16:14:21 +01:00
dt
68d6bfe33b Output parsers: Make target specific code pseudo generic
Introduce IOutputParser::setWorkingDirectory and
IOutputParser::hasFatalErrors()

Reviewed-By: hunger
2010-12-06 14:15:06 +01:00
con
46a1a6b34d Fix compilation of previous commit 2010-12-06 13:03:17 +01:00
Alessandro Portale
48f3e4cd76 Fix command line parsing: Do return empty items.
Symbians Makefiles have a "# Command:" line in the header
which has two whitespaces in the middle. The line parsing bug
fixed by this commit lead to a discrepency of the
"Actual args" (without empty elements) and the "Parsed args"
(with empty elements, otherwise same to Actual args), and
thus to a call of qmake on each build.

Task-Number: QTBUG-15539
2010-12-06 11:56:57 +01:00
con
277d9be93a Update the qt version description on name change.
It was not updating to "has no name" when editing the version name.
This moves the construction of the description to QtVersion.
2010-12-06 11:18:58 +01:00
Tobias Hunger
640a9c32c0 Compile fix 2010-11-26 15:36:06 +01:00
Tobias Hunger
283af9d5ce Compile fix 2010-11-26 15:23:44 +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
f3b5c98bf5 Merge remote branch 'origin/2.1' 2010-11-23 15:44:58 +01:00
Tobias Hunger
32dd271aa9 Symbian: Unset SBS_HOME when not needed
Unset SBS_HOME when none is needed. This prevents SBS from getting
confused about where its dependencies are located.

Task-number: QTCREATORBUG-3145
Reviewed-by: Alessandro Portale
2010-11-22 15:53:02 +01:00
dt
c9c5fe1542 Merge remote branch 'origin/2.1'
Conflicts:
	share/qtcreator/static.pro
	src/plugins/qmljseditor/qmljshoverhandler.cpp
	src/plugins/qt4projectmanager/gettingstartedwelcomepagewidget.cpp
2010-11-18 19:28:23 +01:00
Daniel Molkentin
7ea4d2bb7b Make preferred version work in all cases
Reviewed-by: dt
2010-11-18 15:35:41 +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
Tobias Hunger
9f824f4165 Symbian: Fix pathes
Fix pathes for Nokia Qt SDK:
 * Set SBS path in one location only
 * Fix up perl path
 * Set path to CMD on windows. Both ABLD and SBSv2 actually need this.
 * Set GCC path only if the directory actually exists

These fixes allow for building both ABLD and SBSv2 based projects in
a clean environment.

Reviewed-by: Tim Jenssen
2010-11-17 11:28:05 +01:00
kh1
0985f9c1c4 Fix ambiguity with help manager by renaming the file to match class.
Task-number: QTCREATORBUG-3090
Reviewed-by: ck
2010-11-16 16:25:55 +01:00
Oswald Buddenhagen
04d4d309f7 Merge remote branch 'origin/2.1'
Conflicts:
    share/qtcreator/static.pro
    src/plugins/qmljseditor/qmljsoutlinetreeview.cpp
    src/plugins/projectexplorer/outputwindow.cpp
2010-11-15 19:03:18 +01:00
Oswald Buddenhagen
a783a90f4d compile, thank you very much 2010-11-15 19:00:07 +01:00
Tobias Hunger
951123a211 Symbian: Allow installer to set SBS v2 directory
Allow the installer to specify the SBS v2 directory.

Reviewed-by: Tim Jenssen
2010-11-15 17:05:08 +01:00
Tobias Hunger
542fdc0705 Symbian: Provide field in Qt version to set up SBSv2
Provide a field in the symbian Qt version to set up the SBSv2 build
system.

Reviewed-by: dt
2010-11-15 16:04:38 +01:00
Friedemann Kleint
4768bb8df2 Qt4ProjectManager: Compile on Non-windows. 2010-11-03 09:17:02 +01:00
Friedemann Kleint
0aaeae97c6 Qt4ProjectManager: Do not include windows.h in qtversionmanager.
Move 64bit-binary detection into Utils library.
2010-11-03 09:05:14 +01:00
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
Oswald Buddenhagen
a9ff4d3749 Merge remote branch 'origin/2.1'
Conflicts:
	doc/qtcreator.qdoc
2010-11-01 12:11:03 +01:00