Commit Graph

48 Commits

Author SHA1 Message Date
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Thomas Hartmann
dea111abd1 QtQuickAppWizard: stating qt requirements in the description.
We should mention the correct Qt requirements to avoid confusion.

Change-Id: I8d729075359606b632ed617ae898d9f9ddacdfa2
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-28 15:57:52 +01:00
Thomas Hartmann
fd367ec8ae Wizards: qml project support is desktop only
We support (pure) qml projects only on the desktop.

Change-Id: Ib68d8ddab053a2b4e4b60cc07e9408eff0e27d63
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-02-23 14:33:08 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Thomas Hartmann
0f073e4a35 Wizards: avoiding code duplication
I moved setPath(wizardDialogParameters.defaultPath()) into
the constructor of BaseProjectWizardDialog.

I created addExtensionPages() instead of having of having the
foreach everywhere. Moving the call into the constructor of
BaseProjectWizardDialog is not trivial since a lot of derived classes
rely on execution order and the order is often different.
Entangling this is not trivial and easily might break functionality.

Change-Id: I48dddaf72caea84da783dc9e2f42f2c7eff1c0ce
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-02-15 10:56:54 +01:00
Thomas Hartmann
95a028e835 Wizards: changes the structure of Wizards
This patch introduces platforms as a top level topic when choosing
a wizard. Also I changed the categories and priorities.

Details:

1. I did change the way the dialog/view is structured in newdialog.cpp

2. I added platformName() and supportsPlatform() to BaseQtVersion.
   I needed two functions because the Simulator does not provide a platform
   and therefore has no platformName but supports two platforms.
   I still have to turn the platform names into proper constants.

3. I changed the categories and priorities to get the layout that was
   discussed. (I had to touch quite alot of files but this is mostly trivial)

4. I added a combobox that allows filtering for platforms.

5. I added flags() to IWizard to indicate that a wizard is platform independent.

Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 17:42:27 +01:00
Thomas Hartmann
821eab6c52 Wizards: refactoring - adding WizardDialogParameters
The Wizards itself (derived from IWizard) and the dialogs
implementing the wizards were quite discoupled.
Since I want to add parameters that are delivered from
IWizard::run to the dialog a I added WizardDialogParameters.

Examples of paramters I want to add are the choosen platform
and the choosen subOption/template for this wizard.

Change-Id: I9c0ae2901e3d46d3c36a3f433f4d7d508a6ba74e
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-07 16:26:10 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
Alessandro Portale
adc52bf783 Let the Qt Quick Wizard output import QtQuick 1.1 (instead of 1.0)
...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or
Maemo are supposed to be targeted.

Task-Number: QTCREATORBUG-6528
Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-17 16:36:50 +01:00
Robert Loehning
7ec73a3e16 String fixes
Change-Id: Iffa87a0e394b799e3987fa60f0a7559d5c1d0d27
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-03 10:36:46 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Eike Ziller
bbfa7e0020 Merge app_version.h and ide_version.h
Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c
Reviewed-on: http://codereview.qt.nokia.com/3918
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-08-31 13:48:00 +02:00
dt
754be1bcfc Move a lot of qmake independent classes to a new plugin qtsupport
Also adjust qmldumptool to remove the dependency on qt4project/qmlproject, by
passing in the qtversion instead of figuring it out in qmldumptool.

Change-Id: Ie6ac582d36bfef290313c0716b33b62fcf42630c
Reviewed-on: http://codereview.qt.nokia.com/70
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-05-24 18:35:11 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
f37d9b55aa L10n: First round of tr()-Fixes for 2.2 2011-02-14 16:37:20 +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
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
Kai Koehne
c4e4913870 QmlProject: Add mainFile property
The mainFile property of QmlProject is the default file to run. People
have still the opportunity to override this in their run settings,
though.

The wizard generated code was updated accordingly. Note that this makes
projects generated by the wizard incompatible with QtCreator 2.1!

Task-number: QTCREATORBUG-3249
2010-12-08 15:08:49 +01:00
Kai Koehne
33d66233b5 QmlWizards: Use 'QtQuick 1.0' namespace
Use the 'QtQuick 1.0' namespace introduced in 4.7.1. This makes them in
line with the examples/demos we ship in the SDK, but breaks for 4.7.0
(e.g. N900).

Task-number: QTCREATORBUG-3243
2010-12-07 11:27:30 +01:00
Kai Koehne
e35c53e7f8 QmlWizards: Unify templates
Unify the original qml file generated by Qt Quick UI / Qt Quick
Application wizards. Use a default size of 360x360.
Furthermore, add a MouseArea such that clicking on the app will close
it (demonstrating the use of Qt.quit()).

Reviewed-by: Alessandro Portale
2010-11-12 13:54:54 +01:00
Thomas Hartmann
fefc6cfe6d Using import Qt 4.7 (again)
We have to support the  N900

Reviewed-by: dt
2010-10-06 13:35:47 +02:00
Thomas Hartmann
defb9881b1 QmlWizards: use QtQuick 1.0 instead of Qt 4.7
Reviewed-by: Kai Koehne
2010-10-04 16:21:32 +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
Christian Kandeler
f615efeced QML wizards: Change names and descriptions.
Reviewed-by: Leena Miettinen
2010-09-28 14:46:59 +02:00
Friedemann Kleint
7e739985b2 Merge remote branch 'origin/2.0'
Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
2010-08-06 10:46:50 +02:00
Friedemann Kleint
111b89d755 QML: Name wizards correctly.
Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>
2010-08-05 16:54:04 +02:00
Alessandro Portale
ede8cae919 Remove the icon size hack for QML_WIZARD_ICON 2010-07-09 20:02:34 +02:00
Christian Kamm
51a75e3c20 QmlJS: Remove spurious spaces from default import path in qmlproject.
What about paths that actually contain spaces?

Reviewed-by: Erik Verbruggen
2010-06-24 13:46:53 +02:00
Daniel Molkentin
9d609c88c8 Revert "Mark QML support in Qt Creator 2.0 as preview"
Not needed anymore after the general QML support got deactivated.

This reverts commit 74bd95d323.
2010-06-01 14:40:06 +02:00
Daniel Molkentin
74bd95d323 Mark QML support in Qt Creator 2.0 as preview
Reviewed-by: Kai Koehne
2010-05-31 16:37:17 +02:00
con
2d17da65a9 Icon update. 2010-05-18 14:26:33 +02:00
Daniel Molkentin
bf95a99c51 New texts for the wizard types in the new dialog
Reviewed-by: Leena Miettinen
2010-05-12 14:16:49 +02:00
Friedemann Kleint
0a643a1994 Wizards: Open a relevant file in editor after the wizard run
Remove all hacks/conventions of considering the last generated
file as project file, etc. and instead add attributes flags to
Core::GeneratedFile, giving fine-grained control of what to do
with the file. Implement static utility functions in wizards
that handle it. Add boolean XML-attributes "openeditor"/"openproject"
to the file elements used by the CustomWizard XML-specification.
Manually set the attributes in all wizards.

Task-number: QTCREATORBUG-1166
2010-04-16 15:55:38 +02:00
Kai Koehne
e959967f11 Qml support: Bump version of qml files from Qt 4.6 to Qt 4.7
Reviewed-by: Thomas Hartmann
2010-04-13 15:15:16 +02:00
Jarek Kobus
20c0817a3f Replace QWizard with Utils::Wizard 2010-03-31 15:22:14 +02:00
Kai Koehne
3984c057b8 QmlProject file format: Let filters recurse by default
E.g. "QmlFiles {}" now also monitors subdirectories by default, while
"QmlFiles { paths : ["bla.qml"] } does not.

Task-number: BAUHAUS-503
2010-03-22 10:21:18 +01:00
Kai Koehne
89ef33557f QmlProjectManager: Show user how to set plugin paths in .qmlproject file
Suggested by Erik Verbruggen
2010-03-19 15:15:36 +01:00
Friedemann Kleint
bbcacaf59f Header cleaning spree in Core/Debugger and Symbian/Maemo-code of Qt4. 2010-03-18 10:59:06 +01:00
Kai Koehne
718dd06ed8 Make use of QML, Qml, and Quick consistent
- It's QML, not Qml. But this is only the file format.
- The umbrella term is Quick (or Qt Quick, to be sorted out)
2010-03-18 10:50:51 +01:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Tobias Hunger
93d3205459 Update Wizards to new signature
Seems like I missed some the first time round. Sorry for that!
2010-02-18 16:10:56 +01:00
Kai Koehne
06abd3b59d Renaming Qml wizards
Unify names to QmlProjectApplicationWizard & QmlProjectImportWizard
2010-02-18 15:34:17 +01:00