Commit Graph

263 Commits

Author SHA1 Message Date
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
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
Daniel Molkentin
7ea4d2bb7b Make preferred version work in all cases
Reviewed-by: dt
2010-11-18 15:35:41 +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
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
Daniel Molkentin
ac18c37417 Prefer Qt version to show examples from
Reviewed-by: Niels Weber
2010-10-27 18:55:27 +02:00
Friedemann Kleint
f1fb0bddb1 Debugger/JS Code model: Set environment for QML tools correctly.
Set complete build environment (MinGW).

Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>

Task-number: QTCREATORBUG-2883
2010-10-26 15:39:37 +02:00
Kai Koehne
593bd0d975 DebugHelpers: Remove incorrect warning about qmldump requiring 4.7.1
qmldump works fine with 4.7.0 (as long as private headers are available).

Reviewed-by: ckamm
2010-10-25 14:16:14 +02:00
Kai Koehne
206a79a3fb DebugHelpers: Always update icons after recompile
The information about a Qt version (including the debugging helper paths)
is cached. Invalidate the cache after all the debugging helpers have
been built, such that the following icon updates actually get the latest
information.

We do invalidate the cache already before the compilation of
the debugging helpers have started, but QmlDumperTool::canBuild
then triggers a refill of the cache, at a time where the qmldump
executable has not yet been created.

Reviewed-by: Friedemann Kleint
Task-number: QTCREATORBUG-2807
2010-10-25 14:15:56 +02:00
con
9240ceaf35 Add the path to the installed Qt Frameworks on Mac.
Otherwise all the Qt headers might not be found at all.

Task-number: QTCREATORBUG-1377
Reviewed-by: Tobias Hunger
Reviewed-by: Erik Verbruggen
2010-10-18 18:11:40 +02:00
Christian Kamm
6f41ebafc7 QtVersionManager: Extract the default QML import path from qmake.
Task-number: QTCREATORBUG-2639
Reviewed-by: dt
2010-10-13 13:31:30 +02:00
Friedemann Kleint
f5909abe09 Debugging helpers: Fix building
- Report errors correctly.
- Do not pass empty target argument to qmake
- Give 'make' a longer timeout and change timeout checking to
  trigger after last output line was obtained from process
- Make build log dialog non-modal and ensure it pops up on failure
  even if a different Qt version was selected in-between
- Disable Rebuild-button while build is running.

Reviewed-by: Kai Köhne <kai.koehne@nokia.com>
Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
2010-10-08 15:13:02 +02:00
Friedemann Kleint
ea221b7ec1 Debugging Helpers: Include MinGW.
Reviewed-by: hjk
Acked-by: hjk
2010-10-07 11:02:00 +02:00
Friedemann Kleint
520c936a45 L10n: tr()-Fixes 2010-10-05 09:44:33 +02:00
Christian Kamm
00a8d9c32b QmlJS: Try to build qmldump when opening a Qml project.
To make plugin dumping work without having to compile the debugging
helpers explicitly.

Reviewed-by: Kai Koehne
2010-09-30 15:10:33 +02:00
Kai Koehne
88a36fe34c DebuggingHelpers: Check for Qt version instead checking private files
The location private includes might still change with 4.7.1 . Better
check the qt version string.

Reviewed-by: Lasse Holmstedt
2010-09-30 12:02:26 +02:00
Lasse Holmstedt
2129b0bcd0 Fix issues with showing correct status of debug helpers
Reviewed-by: Thomas Hartmann
2010-09-30 09:37:42 +02:00
Lasse Holmstedt
96d991bbdc QML Observer: Build together on runtime with debugging tools
Moved qmljsdebugger to a dir under qml/, made qmlobserver compile
without creator dependencies and made it compile with debugging
helpers.

Reviewed-by: hjk
2010-09-29 09:39:30 +02:00
Lasse Holmstedt
5d9858129a Compile qmldump with debugging helpers
Must be compiled during runtime - otherwise, the app may not work
with Qt that is compiled with another compiler.

Reviewed-by: hjk
2010-09-29 09:39:18 +02:00
Robert Loehning
315319ab14 Fixed HTML tags for tooltip 2010-09-24 16:24:00 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment
Reviewed-by: dt
2010-09-23 13:40:26 +02:00
Oswald Buddenhagen
8fc775eb58 fix parsing of "-after" in qmake argument extractor 2010-09-17 12:34:14 +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
dt
95e666e740 Increase the timeout waiting for qmake to finish from 2 to 10 seconds. 2010-08-26 17:45:16 +02:00
Tobias Hunger
f3f6d642e5 Properly detect Qt versions of directories
* Detection of Qt versions from a makefile failed on windows
   when calling qmake without the drive letter. Make this work.
2010-08-24 18:28:52 +02:00
Tobias Hunger
4fc6393ff2 Fix indention 2010-08-24 18:28:52 +02:00
Kai Koehne
ef1e52dfd1 Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline
Conflicts:
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/gdbmacros/dumper.py
	share/qtcreator/gdbmacros/gdbmacros.py
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/debugger/gdb/attachgdbadapter.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
	src/plugins/mercurial/mercurialjobrunner.h
	src/plugins/qmljseditor/qmljseditor.cpp
	src/plugins/qmljseditor/qmljseditor.pro
	src/plugins/qmljseditor/qmljseditorplugin.cpp
	src/plugins/qmljseditor/qmljseditorplugin.h
	src/plugins/qmljseditor/qmljspreviewrunner.cpp
	src/plugins/qmljseditor/qmljspreviewrunner.h
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qmlprojectmanager/qmlprojectrunconfiguration.cpp
	src/plugins/qt4projectmanager/qt-maemo/qemuruntimemanager.cpp
	src/plugins/qt4projectmanager/qt4projectmanager.pro
	src/plugins/qt4projectmanager/qtversionmanager.h
	src/plugins/qt4projectmanager/wizards/targetsetuppage.cpp
	src/plugins/qt4projectmanager/wizards/targetsetuppage.h
2010-08-23 16:00:24 +02:00
Kai Koehne
60fffda9eb QmlProject: Search for qmlviewer in configured Qt versions (if not found in $PATH)
If no 'qmlviewer' executable is found in the PATH, iterate through the
list of configured Qt versions and try to find a qmlviewer there. This
should help users configuring creator such to play with Qml.

Right now the first qmlviewer found in a Qt version is selected. A UI
to let the user select one explicitly was not possible any more (string
freeze).

This requires a dependency from QmlProjectManager to
Qt4ProjectManager.

Reviewed-by: dt
2010-08-19 17:22:13 +02:00
Tobias Hunger
5b72808192 Reuse existing string for new "builddir.level != sourdir.level" warning
* Revert this once string freeze is over!
2010-08-19 16:11:10 +02:00
Tobias Hunger
423686c0a9 Report project issues in the Project Mode window
* Add test for build- and sourcedirectories being at different levels

Reviewed-by: dt
2010-08-19 15:09:26 +02:00
Tobias Hunger
2430059345 Replace tab with spaces 2010-08-17 12:52:42 +02:00
Tobias Hunger
b797ccaa3e Add function to find out whether sbsv2 is used
* Add function to check whether the new symbian build system is used
   to build a Qt version. This will be used to decide which parsers
   to use when building for symbian
2010-08-11 15:41:52 +02:00
Oswald Buddenhagen
04bee3be57 change the way how loading of configs & features is controlled
make it an argument of the main entry point instead of a property
2010-06-24 18:57:50 +02:00
Oswald Buddenhagen
704deac4e2 micro-optimize: allocate ProFileEvaluator on the stack 2010-06-18 21:26:38 +02:00
Oswald Buddenhagen
192759cb9a use a ProFileParser+ProFileEvaluator instead of a ProFileReader
the latter does too much
2010-06-18 21:23:09 +02:00
Oswald Buddenhagen
058354ceab refactor ProFileEvaluator, part 2: split off ProFileParser 2010-06-18 21:21:36 +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
kh1
1b6ad08795 Move help manager into core.
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
2010-06-11 13:11:37 +02:00
Tobias Hunger
7f58e0e8a3 Improve detection of simulator Qts
* Make this more reliable and faster using less code.

Reviewed-by: dt
2010-06-10 15:21:34 +02:00
dt
69bd2df4e4 Fix QMAKE_CXX parsing
Task-Nr: QTCREATORBUG-1411
2010-05-27 16:36:26 +02:00
Daniel Molkentin
5784e2ad86 prefer adding Qt versions shipping with QML examples
Reviewed-by: dt
2010-05-25 19:23:28 +02:00
kh1
e9d1841552 Make sure we can compile the debugging help for maemo.
This boils down to the same problem as other calls to qmake, if we don't
pass the target mode, qmake will prepend the current platform as target.
Reviewed-by: dt
2010-05-21 14:43:18 +02:00
dt
5193cef369 Remove dead code 2010-05-18 17:40:34 +02:00
dt
3cc8f2f9e0 Fix check for g++ 2010-05-18 17:40:34 +02:00
dt
cf57bda96f Maemo does support shadow building 2010-05-12 16:50:37 +02:00
Tobias Hunger
78989998d5 Mark simulator as a mobile target 2010-04-30 14:27:51 +02:00
Tobias Hunger
69100c353c Add a special target for Qt simulator 2010-04-30 14:27:50 +02:00