Commit Graph

234 Commits

Author SHA1 Message Date
Tobias Hunger
9b465749f0 Add toolchain autodetection based on config file
Add toolchains found in share/qtcreator/Nokia/toolChains.xml as
autodetected.
2011-03-01 16:35:03 +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
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 Kandeler
f0a54abf6b Maemo: Introduce dedicated Fremantle and Harmattan targets.
Task-number: QTCREATORBUG-2770
2011-01-18 15:22:12 +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
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
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
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header.
Acked-By: dt
2010-11-01 14:25:24 +01:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Friedemann Kleint
2a44ef758c Header cleaning: Make Toolchain::equals take const parameters. 2010-09-20 16:42:30 +02:00
Christian Kandeler
b8186493ee Toolchain processes: Make source of warnings easier to locate.
Reviewed-by: Friedemann Kleint
2010-09-10 11:07:20 +02:00
Friedemann Kleint
97e7c12e3c Code polishing, continuing cb23999fbf
Add more error messages to processes run for toolchain detection.
Move Windows-specific code to dbgwinutils, remove inclusion of
<windows.h>. Fix MinGW gcc 4.5 warnings.
2010-09-09 09:58:17 +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
Friedemann Kleint
e8373b9dbe Detect MSVC 2010.
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Task-number: QTCREATORBUG-1710
2010-06-23 10:58:40 +02:00
Friedemann Kleint
9d2ca0e8cf MSVC: Try to determine version if none is set.
Try to find matching version for mkspec.
Rubber-stamped-by: Joerg Bornemann <qtc-committer@nokia.com>
2010-04-21 17:24:37 +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
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
d7b927f2d2 Windows: Add Support for Windows SDKs
Detect SDKs before VC installations. Add static list of installations
initialized on demand. List SDKs and VC with platforms settings
depending on Qt-version. Detect installations properly, checking
existence of setup scripts. Handle delayed shell variable expansion used
by SDK setup scripts. Tested with SDK 6.1 onwards (32bit/64bit).
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2010-03-04 15:23:16 +01:00
Friedemann Kleint
7c9c99dcf0 Symbian/Linux: Enable building with makefile-based system.
- Autodetect SDK by environment variable EPOCROOT and qt directory
below.
- Environment::appendOrSet/prependOrSet: Avoid duplicate entries
- Rename toolchain enumeration value
- Adapt S60ToolChainMixin to new GnuPoc setup, provide routines for
  all required variables.
- RVCTToolChain: Make RVCT detection smarter (Check for RVCT<v1><v2>BIN
  variable). Set all required variables in case of RVCTToolChain/GnuPoc
- QtVersionManager: Detect toolchain and Qt version properly, make S60
  device run config accept toolchain.
- Modify S60DeviceRunControl to execute 'make sis'
- Modify S60Devices::detectQt...() to check for Qt installed into SDK
  first and symlink as fallback.
2010-02-17 17:38:48 +01:00
Erik Verbruggen
070d06c163 Changed BLOCKS undef on MacOS to work with system header files. 2010-02-15 17:13:30 +01:00
Kai Koehne
6c4b9ba227 Reapply unconnected changes from reverted commit
Only revert stuff that is linked to fast string concat.
2010-02-08 11:13:55 +01:00
Kai Koehne
999c73ad9d Revert "compile everything with QT_USE_FAST_CONCATENATION"
This reverts commit e70530c5ad. It
did break builds on older gcc versions (gcc 4.1.2 64 bit Linux,
gcc 4.0.1 on Mac OS X):

parser/qmljsgrammar_p.h: In static member function ???static int
QmlJSGrammar::nt_action(int, int)???:
parser/qmljsgrammar_p.h:188: error: ???QmlJSGrammar::<anonymous enum>???
is/uses anonymous type
parser/qmljsgrammar_p.h:188: error:   trying to instantiate
???template<class T> struct QConcatenable???
...
2010-02-08 10:56:50 +01:00
Oswald Buddenhagen
e70530c5ad compile everything with QT_USE_FAST_CONCATENATION 2010-02-05 15:20:25 +01:00
Roberto Raggi
da91bac28c Compile. 2010-02-01 14:01:31 +01:00
Friedemann Kleint
2fd8b2d7ff Fix some code scanning issues.
QString: Use QChar where appropriate.
2010-02-01 12:43:56 +01:00
Oswald Buddenhagen
75b42f18d8 Merge remote branch 'origin/1.3'
Trailing whitespace removal re-applied manually.
2010-01-29 22:50:23 +01:00
Oswald Buddenhagen
a6ca348636 remove trailing whitespace
doing it in 1.3 as well to avoid possible later conflicts
2010-01-29 21:33:57 +01:00
Erik Verbruggen
c73bf0041d Fixed macro definitions. 2010-01-22 11:23:23 +01:00
Erik Verbruggen
4b97bf170a Define __strong and __weak to be empty macros, so we "handle" Apple's GC C extension. 2010-01-22 10:04:01 +01:00
Erik Verbruggen
9ea5264edd When running on MacOS, undefine __BLOCKS__ in the preprocessor flags of the C++ parser.
We don't support blocks yet, and this way we get rid of quite some
parsing errors (resulting in undefined or wrongly defined types, messing
up the semantic passes).

Reviewed-by: Roberto Raggi
2010-01-22 09:53:59 +01:00
Daniel Molkentin
3cf861a8ce Add windows definitions to make the code model happy.
__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places

Reviewed-By: Roberto Raggi
(cherry picked from commit 5832c6b584)
2009-12-18 13:57:32 +01:00
Daniel Molkentin
8b3bbc0875 Creators code model cannot handle MVC extensions. Don't pretend it can.
Fixes some highlight errors in code using the win32 API.

Reviewed-By: Roberto Raggi
(cherry picked from commit 771246a5b5)
2009-12-18 13:57:25 +01:00
Daniel Molkentin
771246a5b5 Creators code model cannot handle MVC extensions. Don't pretend it can.
Fixes some highlight errors in code using the win32 API.

Reviewed-By: Roberto Raggi
2009-12-10 16:40:41 +01:00
Daniel Molkentin
5832c6b584 Add windows definitions to make the code model happy.
__stdcall for all compilers (MSVC and MinGW, possibly others may use it)
__w64 is MSVC only, deprecated there, but still used in some places

Reviewed-By: Roberto Raggi
2009-12-10 16:38:19 +01:00
Tobias Hunger
ec025c6dbf Rework Build Parser handling
* Rework IBuildParser:
    * Remove name() method.
    * Remove enterDirectory and leaveDirectory signals.
    * Allow chaining of parsers.
 * Rename IBuildParser to IOutputParser.
 * Implement GnuMakeParser.
    * Remove entering/leaving directory related code from all other parsers
    * Move filename fixup heuristic based on entering/leaving directory
      massages from gnumake here from AbstractMakeStep.
 * Add outputParser method to ToolChain: This removes the need to map
   toolchains to BuildParser names in the BuildSteps.
 * Enhance AbstractProcessStep to accept a IOutputParser to parse its output.
 * Remove AbstractMakeStep.
 * Set the appropriate Parsers in all classes deriving from AbstractProcessStep
   and append the ToolChain's parser to the parser chain.
 * Remove BuildParserFactories: There is no more need for them.
 * Remove constants used to identify the BuildParsers.
 * Clean up some names:
    * Replace stdOut with stdOutput.
    * Replace addToTaskWindow with addTask and addToOutputWindow with
      addOutput. Do this wherever it is not yet clear that this will end up
      in the Task/Output window.

Reviewed-by: dt
2009-12-09 18:39:03 +01:00
Friedemann Kleint
e35a754dc9 S60: Work towards new toolchains
Factor out the initialization setting up the environment and headers in
the RVCT/GCCE toolchains.
Modify the RunControl to be able to support different package
building/signing processes.
2009-11-13 15:47:35 +01:00
con
468b76fff2 Merge commit 'origin/1.3' 2009-11-05 19:00:23 +01:00
Robert Loehning
2dfa6e948e Correct case for translations of "MinGW"
Reviewed-by: Oswald Buddenhagen
2009-11-05 14:05:21 +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
ck
6a49395e33 Add experimental Maemo support.
Includes Maemo tool chain, run configuration, run control,
manager, etc.

Adds the DebuggerManager to the object pool. This is ugly, but
nobody came up with anything better on short notice. To be
refactored.

Co-Authored-By: kh1
2009-10-16 18:01:07 +02:00
Daniel Molkentin
1da8ccae81 Define _WIN32_WCE if using the MSVC for Windows CE compiler.
Also, remove bogus default defines.

Reviewed-By: joerg
2009-10-15 16:41:08 +02:00
Aaron McCarthy
2c17c75639 Windows CE SDK not always found.
Creator fails to set up the build environment with MSVC 2008 and
Windows Mobile SDK 6.  This is caused by two problems:

1. The toolchain was being searched for in
   C:\Program Files\Microsoft Visual Studio 9.0\VC\VC
   The correct path is
   C:\Program Files\Microsoft Visual Studio 9.0\VC

2. Include statements in mkspecs were not being processed.  All of the
   important variables are set in files included from the
   wincewm60{standard,professional}-msvc2008 mkspecs.
2009-10-15 09:12:59 +10:00
Daniel Molkentin
28231f8f9c Add more MSVC specific intrinsics. 2009-10-14 18:10:59 +02:00
Daniel Molkentin
ff0cb8facb Make __int64 valid for MSVC in the code model.
Reviewed-By: Roberto Raggi
2009-10-06 14:40:41 +02:00
Daniel Molkentin
bb8e8ef556 Remove leftover QTCREATOR_FROM_S60 ifdef from ProjectExplorer.
Reviewed-By: con
2009-10-05 18:43:23 +02:00