Commit Graph

59 Commits

Author SHA1 Message Date
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
Jarek Kobus
674ee95a2b Remove unused constants
Reviewed-by: Tobias Hunger
2011-04-12 13:11:46 +02:00
Tobias Hunger
429ed63f5d Fix spelling of tool chain is user-visible strings and comments 2011-03-16 18:01:52 +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
Alessandro Portale
80b2b71a5b Using official html5 logo as icon for the html5 Application Wizard
http://www.w3.org/html/logo/
2011-02-11 14:42:22 +01:00
Alessandro Portale
38edea5019 Renaming: QmlStandaloneApp* -> QtQuickApp* 2011-02-06 16:23:02 +01:00
Alessandro Portale
7870769a30 Html5 app wizard. First steps.
Task-Number: QTCREATORBUG-3284
2011-02-06 14:08:52 +01:00
Leena Miettinen
d5a33d2860 Wizards: change terminology
Reviewed-by: dt
2011-02-03 15:54:19 +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
dt
6c61ea2251 Project Wizards: Make the categorie names reflect the contents
Also reorder the contents to have Qt Quick on top. Move Console Qt
to Other Projects.

Qt QWidget project isn't the best name, but the new structure is a
improvement so using it for now.

Task-Nr: QTCREATORBUG-3513

Ack-By: con
Ack-By: kkoehne
2011-01-24 17:30:31 +01:00
dt
063c4ff670 Add "Run" to projectexplorer context menu
Task-Nr: QTCREATORBUG-2166
2011-01-21 13:35:23 +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
dt
7a71db32b4 Coding style 2010-12-07 16:46:38 +01:00
Jarek Kobus
b6da2d4537 Implement "Jump To File Under Cursor" in profile editor
Reviewed-by: dt <qtc-committer@nokia.com>
Reviewed-by: ossi <oswald.buddenhagen@nokia.com>
Task-number: QTCREATORBUG-688
2010-10-14 11:58:34 +02:00
Christian Kandeler
36b17fd974 Wizards: Move QML standalone app wizard to QML category.
Task-number: QTCREATORBUG-2510
Reviewed-by: Alessandro Portale
2010-10-04 14:52:56 +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
Alessandro Portale
46c7d8f1d2 Moving the "Qml standalone" wizards from qmlpm to qt4pm 2010-08-25 14:25:35 +02:00
Jarek Kobus
573006f370 Add "Add library wizard" to the pro file editor
Reviewed-by: dt <qtc-committer@nokia.com>
Task-number: QTCREATORBUG-125
2010-08-16 18:25:38 +02:00
Alessandro Portale
408a8273fe No hardcoded QMLINSPECTOR_PATH in the qml app .pro file.
Instead of hardcoding a Qt Creator path into the standalone Qml
app .pro file by assigning a value to QMLINSPECTOR_PATH, we let
Qt Creator set that value as command line argument when calling
qmake.

QMakeStep::allArguments() is the place where it is added right
dt will will certainly suggest a better place place for it.
2010-08-09 22:21:07 +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
Alessandro Portale
3aa3c5688f Pedantic cleanup of filename parameters for QIcon constructor
Using more *::Constants::ICON_* where it makes sense and
wrapping the file names into QLatin1String where they were
missing.

The increased usage of the ICON constants needed a few more
cross plugin includes of *constants.h, here and there.
I think that it is OK, since the dependencies were alredy there
icon resource wise.
2010-07-30 22:17:14 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0'
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
2010-06-02 09:57:23 +02:00
Thorbjørn Lindeijer
0afe76a67c Open .prf files in the pro file editor
This fixes QTCREATORBUG-1434, but it's more of a workaround than a fix.
The problem was that the file was opened in the diff editor due to a
broken diff detection, and the diff editor in turn has a bug in that
it's kind of halfway read-only.

Reviewed-by: ossi
Task-number: QTCREATORBUG-1434
2010-05-31 18:08:19 +02:00
Jarek Kobus
f09d74271c Implement (un)commenting selection of .pro files
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Task-number: QTCREATORBUG-119
2010-05-25 16:18:16 +02:00
con
4532087c90 Merge remote branch 'origin/2.0' 2010-04-30 16:39:05 +02:00
Tobias Hunger
69100c353c Add a special target for Qt simulator 2010-04-30 14:27:50 +02:00
dt
ff61f2295d Add Clean and rebuild sub dir
Also change the strings slightly.

Task-Nr:   QTCREATORBUG-1295
Task-Nr:   QTCREATORBUG-1296
2010-04-30 11:55:04 +02:00
Daniel Molkentin
242fab34e8 Rename "Qt Application Project" to "Qt C++ Project"
This is more consistent with "Qt Quick Project". Also,
capitalize all sections (regression from previous commit).
2010-04-09 17:40:36 +02:00
Thorbjørn Lindeijer
2d21060bc9 Added icons to options dialog categories
Some categories do not have icons yet, unfortunately.
2010-03-26 17:47:31 +01:00
con
d849652700 Start on a build step for creating symbian package. 2010-03-16 19:05:20 +01:00
dt
ab8fc52d0b Use exact and aysnc .pro file evaluate
This is a big change touching almost all of our .pro file parsing.
With this patch we only evaluate once exact for all needs and once
greedy for the filelist. That is the qt runconfigurations don't have own
evaluaters but reuse the project wide exact evaluation.

We reevaluate if the user changes the build directory, the qmake
buildconfiguration or the qmake arguments. That is if you open src.pro
(or projects.pro) of qt with a shadow build you still don't get all the
files, but after correcting the build directory, we reevaluate the .pro
files and find all files. So for a suitable definition of fixed, that
bug is now fixed.

We now get the exact defines of all .pro files instead of all defines for all
buildconfigurations. We still don't distinguish in which
.pro file a DEFINE is set. So the code model now knows about all the
defines set for the given configuration but not for which files it is
actually set. Also that includes all DEFINES set in .qmake.cache or the
mkspecs. This means all defines from .pro files should now work.

The intial loading is still synchronous. I haven't looked into it to
deeply, but it seems possible to make it also async.There are probably a
few issues which need to be solved fist.

Also due to the asynchronous nature of the code, the executable is
updated a few seconds after actually changing the build configuration
2010-03-10 17:02:24 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
con
d4be77b48f Reorder the "new" wizard categories. 2010-01-15 11:07:50 +01:00
dt
fb3ae97df3 Add Build to the right click menu of sub projects for Qt4 Projects
They do what you expect them to do, that is build only a subtree.
The implementation is a little bit strange. We temporarly set the sub
node to be built on the BuildConfiguration, enqueue that
BuildConfiguration (which calls BuildStep::init()), and then reset that
temporary value.

A more general way would be to have the ability to extend
BuildConfiguration::buildProject() in a way that additional data can be
passed to the BuildSteps.

Task-Nr: QTCREATOR-5
Task-Nr: QTCREATORBUG-44
2010-01-13 18:02:22 +01:00
Tobias Hunger
a6ad773722 Make method naming more consistent.
* Use id() for methods returning a string used to represent
    some type of object.
  * Use displayName() for strings that are meant to be user
    visible.
  * Quieten some warnings while touching the files anyway.
  * Move Factories to their products in the plugins where that
    was not done before.

Reviewed-by: dt
2010-01-07 18:17:24 +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
dt
2de390cfdb Move QMakeParser to Qt4ProjectManager 2009-11-30 19:33:14 +01:00
Friedemann Kleint
a8ac34c347 Options: Sort by category, id.
Separate category and trCategory and introduce sorting characters
to the categories. Same for id/name.
2009-11-27 16:12:12 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Sergey Belyashov
0688b27dc5 make more strings translatable
Added translation macros to some editor kinds.
Added possibility to translate names of editors in Open With context menu. Translation context is "OpenWith::Editors".

Merge-request: 808
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2009-07-06 13:33:09 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details.
Reviewed-by: Trust Me
2009-06-17 00:01:27 +10:00
Friedemann Kleint
19663fee41 Added 'Open with ->Qt Designer' in Project Explorer.
Added IExternalEditor which knows a kind and a mimetype.
Make EditorManager and ProjectExplorer "Open With" query
the interface and add the respective kinds.
Add "openExternalEditor" to EditorManager.
Add External editors for Designer and Linguist,
making use of Mac 'open' or Designer's Tcp socket mechanism
to ensure files are opened in the same instance (per Qt version).

Task-number: 249392
Reviewed-by: con <qtc-committer@nokia.com>
2009-05-19 14:54:52 +02:00
dt
2b302332b8 Move QtVersionManager, QtVersion and QtOptionsPage back
After all I don't need all that stuff in the cmakeplugin, all i needed
is now bundled in debugginghelper.h/cpp
2009-04-28 12:45:04 +02:00
dt
8f22417244 Refactoring: Move QtVersionManager to ProjectExplorer.
The Debugger, cmake and Qt4 plugin all need it. More refactoring to it
coming.
2009-04-22 14:52:35 +02:00
dt
e21a74cb35 Change the way the debugging library is build and found, yet again.
We used to build a helper library as part of the project. First with the
qmake -after SOURCES= stuff and after until now with the
gdbmacrosbuildstep. Now, the all new and fancy integretation directtly
into the qt version dialog. You build the debugger library once for
each qt version and then it's there ready to be loaded into each
project build against that qt version. Saves a lot of time.
And makes it possible to also load that library into while debuggign a
cmake project. (Need to hook that up now.)
Unfourtanetly this breaks the custom dumpers if you use a custom run
executable.
2009-03-25 15:18:37 +01:00