feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
31,260 Commits 108 Branches 368 Tags
32d98862e746fa2d815a43e1d35754c89c1ea27a
Commit Graph

197 Commits

Author SHA1 Message Date
dt
77d0637fb6 Qt4BuildConfiguration: Changing qt versions affects the environment 
Reviewed-By: hunger
 2011-04-15 14:17:38 +02:00
Tobias Hunger
7a0c58513a Qt4Bc: Do not store/restore tool chains 
The plain BuildConfiguration aleady does that for us.
 2011-04-14 14:57:54 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
con
3de823ca62 Merge remote branch 'origin/2.2' 
Conflicts:
	qtcreator.pri
	src/plugins/projectexplorer/toolchainmanager.cpp
 2011-03-28 11:40:45 +02:00
Tobias Hunger
3664d20507 Crash: Fix crash when removing a tool chain 
Fix crash on trying to debug an application after the last
tool chain for the Qt version used was removed.

Task-number: QTCREATORBUG-4197
Reviewed-by: dt
 2011-03-24 15:44:38 +01:00
dt
b45a73ffab Use unique build directories per qt version and debug/release 
Reviewed-By: hunger
 2011-03-23 15:27:02 +01:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +01:00
Milian Wolff
d6ea2945f0 add API to query build type (unknown, release, debug) to BuildConfiguration 
Merge-request: 261
Reviewed-by: dt <qtc-committer@nokia.com>
 2011-03-03 16:12:00 +01:00
Friedemann Kleint
87423acca8 Polish target/toolchain warnings a bit. 2011-02-28 12:29:41 +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
Friedemann Kleint
7bd3bba6ee L10n: Tr-fixes for build configurations. 
Remove duplicate code, proper messages, linguist comments.

Task-number: QTCREATORBUG-3821
 2011-02-18 09:59:49 +01:00
dt
e505604b92 ProjectExplore: Introduce dis/enabling of buildconfigurations 
The build actions are disabled if the buildconfiguration is disabled.
The deploy and run actions are disabled if deploying or running invokes
building automatically.

Qt4BuildConfigurations are disabled while parsing.

Task-Nr: QTCREATORBUG-2576
 2011-01-19 15:47:00 +01: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
dt
7f2c4c9b4c Qt4ProjectManager: Fix crash on importing builds 
Task-Nr: QTCREATORBUG-2723
 2011-01-13 13:39:32 +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
dt
95d7639bb7 Qt4: Move Qt4Target and Qt4BC out of the Internal namespace 
Reviewed-By: hunger
 2010-12-07 13:16:07 +01:00
dt
68163942b2 Qt4ProjectManager: Remove special casing symbian in Qt4BC:makefile 
I have no idea why we did that...

Reviewed-By: hunger
 2010-12-06 14:15:06 +01:00
Oswald Buddenhagen
00f2c00ce3 cleaner approach to propagating need for target build config update 2010-12-03 18:18:54 +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
Friedemann Kleint
6510a749b7 ProjectExplorer: Move ToolChainType enumeration into separate Header. 
Acked-By: dt
 2010-11-01 14:25:24 +01:00
Bill King
9293453ced Merge branch '2.1' 
Conflicts:
	tests/auto/fakevim/fakevim.pro
 2010-10-12 10:01:27 +02:00
dt
eadd51fa75 Qt4ProjectBuildConfiguration: Handle env vars in working dir correctly. 
Task-Nr: QTCREATORBUG-2618

Reviewed-By: hunger
 2010-10-11 16:49:01 +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
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
dt
18697127a7 Qt4BuildConf.: Prevent creating BuildConfigurations with invalid Qts 
Task-Nr: QTCREATORBUG-2598
 2010-10-05 13:16:35 +02:00
Tobias Hunger
0a2a28ec47 Do not allow all WS names in Run-/Deploy-/BuildCOnfigs 
Task-number: QTCREATORBUG-2584
 2010-10-05 11:41:41 +02:00
Tobias Hunger
f5c044fe48 Move ProjectExplorer::Environment to Utils::Environment 
Reviewed-by: dt
 2010-09-23 13:40:26 +02:00
Tobias Hunger
747f750370 Set BUILDDIR and SOURCEDIR environment variables 
Set BUILDDIR and SOURCEDIR in the build environment.

Reviewed-by: dt
 2010-09-23 13:40:25 +02:00
Kai Koehne
4ab1c88ba0 QmlJSDebugger: Split library up into a debugger & observer part 
This allows us to enable/disable the experimental observer, independent
from the core javascript-debugger functionality.

Reviewed-by: Christiaan Janssen
 2010-09-22 15:44:48 +02:00
Kai Koehne
82f4e73c7b Qml Standalong App: Fix regression when debugging apps 
Adapt Qt4ProjectManager to use QMLOBSERVER instead of QMLINSPECTOR
(got changed in commit a10b26920)
 2010-09-16 17:04:52 +02:00
Leena Miettinen
0037296d70 Doc - Fix UI text capitalization to follow the KDE style guide. 
Reviewed-by: dt
 2010-09-15 10:30:51 +02:00
Tobias Hunger
d1c23f58a5 Preserve invalid Qt versions when loading a project 
Now that we have 2.0 out we can be less strict when checking
project consistency when loading .user files.  The strictness
was necessary due to upgrading non-target projects to target
projects.

 * Allow for invalid Qt versions when loading a .user file that was not
   updated from the pre-target era.
 * Update the UI to show invalid Qt versions as invalid. Remove
   the Invalid version as soon as a valid one is imported.

This does preserve the buildsteps, too.
 2010-09-13 18:17:51 +02:00
dt
9f68456b65 Give our Profile parser more information from the qmakestep 
e.g. DEFINES+=bla on the qmakestep command line now work

Task-Nr: QTCREATORBUG-2091
 2010-09-01 12:37:29 +02:00
dt
cce21d430d Don't run if the qmake arguments are just in a different order 
The code is technically incorrect and easy to fool.
See the comment in the patch.
 2010-08-30 16:47:34 +02:00
dt
82e137763e More optional debug output for import bc 2010-08-30 16:47:34 +02:00
dt
b68a57b23e Don't import QMLINSPECTOR_PATH qmake settings. 
Task-Nr: QTCREATORBUG-2209
 2010-08-30 16:47:34 +02:00
Tobias Hunger
8cd3b54949 Fix import of existing builds 
* Report what kind of build we have in the tooltip
 * Create only debug/release configuration for debug/release
   configured directories
 * Create debug and release configuraions for debug_and_release
   configured directories
 * Add debug_and_release to options in QMakeStep UI
 * Do not add CONFIG+=debug/release to CONFIG+=debug_and_release builds
 2010-08-16 17:53:34 +02:00
dt
bc28670a17 Fix always running of qmake 2010-08-11 15:39:59 +02:00
Tobias Hunger
ee4a04a20b Refactor deployment 
* Add a DeployConfiguration class to hold settings related
   to deployment.
 * Add BuildStepsList to hold a list of buildsteps
 * Update BuildConfiguration to use BuildStepLists instead of
   manageing lists of buildsteps itself.
 * Update BuildManager to use BuildStepLists in its interfaces
 * Fix fallout introduced by API changes
 * Update .user file to new way of storing settings

Task-number: QTCREATORBUG-1427
Task-number: QTCREATORBUG-1428
Task-number: QTCREATORBUG-1811
Task-number: QTCREATORBUG-1930
 2010-08-02 14:21:05 +02:00
dt
870da8e7e3 Make the build parser for custom build steps depend on the toolchain 
The API addtition to BuildConfiguration of knowing of the default parser
is rather strange, but a necessary evil for this.

Reviewed-By: Thorbjorn

Task-Nr: QTCREATORBUG-514
 2010-07-07 18:17:24 +02:00
Tobias Hunger
8ccbd0ec6b Rename StepType to BuildStep::Type 
* Move and rename the enum
 * Add Q_ENUMS macro

Reviewed-by: dt
 2010-07-06 18:36:30 +02:00
con
7d76940af7 Take the right sis package when using the Smart Installer flag. 2010-05-21 14:18:37 +02:00
dt
1d43d8988a Treat a empty shadow build directory as a default shadow build directory 
Task-Nr: QTCREATORBUG-1164
 2010-05-19 15:32:09 +02:00