feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
15,980 Commits 108 Branches 368 Tags
133feaae51a56a2d971286785ddcfa3609eaac73
Commit Graph

281 Commits

Author SHA1 Message Date
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
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
Daniel Molkentin
ac18c37417 Prefer Qt version to show examples from 
Reviewed-by: Niels Weber
 2010-10-27 18:55:27 +02:00
Friedemann Kleint
54569c0624 Merge remote branch 'origin/2.1' 2010-10-27 11:05:31 +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
Oswald Buddenhagen
dfee3388af Merge remote branch 'origin/2.1' 
Conflicts:
	share/qtcreator/templates/qmlapp/app.pro
	src/libs/utils/filesearch.cpp
 2010-10-18 20:59:12 +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
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +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
dt
a36dc1d41e Qt4ProjectManager: Support Makefile variable 
Pass on the makefile to make, check the right makefile for importing.

Task-Nr: QTCREATORBUG-102
 2010-10-05 17:43:35 +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