Commit Graph

437 Commits

Author SHA1 Message Date
Thomas Hartmann
0812718905 Adding new wizards for QtQuick supporting Qt 5.4.
Change-Id: I2af1cff65032bb583864c1c8ee3a3636a46e3c39
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-10-10 16:09:03 +02:00
Alessandro Portale
b1176b97dd New Qt Creator logo
Change-Id: If00ef246081b72d4f5cc64efb529461c53fb0d23
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-10-09 15:43:28 +02:00
Tobias Hunger
3191aac828 JsonWizard: Replace QmlFileWizard with JsonWizards
Change-Id: If1079db1f4e3eb4fc62d0066a43aa58c072e2290
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-09 10:13:21 +02:00
Tobias Hunger
3277180b0c JsonWizard: Replace Python FileWizard with a JsonWizard
Change-Id: Iebeae1f52cf856e009a0910118829c89dd3ea222
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-01 12:15:03 +02:00
Tobias Hunger
ac02f6fb89 JsonWizard: Replace TextFileWizard with JsonWizard
Change-Id: Iae2833554529c2f333d9781eb0f7fa28f3bfde79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:29:16 +02:00
Tobias Hunger
ed8a9cba2b JsonWizard: Replace Java wizard with JsonWizard
Change-Id: I93fc26e48b39635662662a9ab4040f45fa874876
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:29:08 +02:00
Tobias Hunger
161f33d08a JsonWizard: Replace GLSL wizards with JsonWizard
Change-Id: Ieeeec4d1a023b7cca19e3bd23ba1aa6dd1d76e72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 17:28:58 +02:00
Tobias Hunger
989ed95c1f CppEditor: Replace CppFileWizard with two JsonWizards
Change-Id: If39ed6d2711fa4cc144d1b1f9738acf3d04ac225
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-30 15:14:29 +02:00
Tobias Hunger
31b83d27e8 ResourceEditor: Replace ResourceWizard with a JsonWizard
Change-Id: I0fb76c8627f65329d1bfebecf44cc3c75e6b07b5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-30 10:56:32 +02:00
Tobias Hunger
9a3a3d4711 JsonWizard: Remove scratchfile wizard
Replace it with a json wizard based implementation.

Todo: This removes the keyboard shortcut available to trigger
this wizard. We should make sure all wizards are available
for binding keyboard shortcuts to them instead.

Change-Id: I1aa76222d08371e79c40b52aeb26705f3ccb4899
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-25 10:55:40 +02:00
Eike Ziller
914adeab82 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/qmldesigner/designercore/model/plaintexteditmodifier.cpp
	src/plugins/qmldesigner/designercore/model/texttomodelmerger.cpp

Change-Id: I1627f6aa98a442413f8b08b579ecaf9647dc887b
2014-09-16 15:17:21 +02:00
Oswald Buddenhagen
df1f576666 use DISTFILES instead of OTHER_FILES in docs, templates, and editors
the latter variable is entirely meaningless to qmake and should have
never been recognized by creator. unfortunately, qmake's dist target
wasn't very useful before qt 5.4, so it didn't occur to anybody to
actually use the variable associated with it, even though it is
semantically exactly the right thing.

Change-Id: I249857f54fdc38fb5ecac0f608e5f4140624c23c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-15 13:19:27 +02:00
Christian Stenger
bfdbd9c1cb Templates: Remove wrong version information
Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-08 15:26:13 +02:00
Christian Stenger
275f491e1b Templates: Fix integration of BlackBerry wizard
Issue was introduced in d3126c5050.

Change-Id: Icd06050e6eb0c702f5dc079fe94c2b4496a9bcba
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-04 10:42:19 +02:00
Tobias Hunger
d3126c5050 Wizards: Consistently use singular in categories
Change-Id: I56adf09eb6c049302ae644e70f3475fd4a4fd4bc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-03 16:52:57 +02:00
Eike Ziller
49db3a450a Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/cppeditor/cppeditor.cpp
	src/plugins/remotelinux/remotelinuxdebugsupport.cpp
	src/plugins/texteditor/basetexteditor.cpp

Change-Id: I0da7c1cf2506b12d0563795aa8177fc45e97050f
2014-09-03 16:08:02 +02:00
Eike Ziller
b5b6a46b4e ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec files
Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-02 15:11:24 +02:00
jkobus
96a32bf2cb Add qtquick 2.3 and qtquickcontrols 1.2 templates
Change-Id: Id71a21b273d2d156cb55033ad6a9ae2bcf5565ca
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-08-28 12:37:06 +02:00
Eike Ziller
aa6495a261 ExtensionSystem: Remove Qt4 support
Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5.

Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-27 08:44:34 +02:00
jkobus
2693e08768 Add an Open menu action to qt quick templates
Task-number: QTCREATORBUG-11728
Change-Id: I7f3ad47a2fe4a247efefe57a0de5149c64ac2456
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-26 10:08:14 +02:00
Eike Ziller
d9d0aba1c4 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1
2014-08-15 16:14:34 +02:00
Christian Stenger
30ab57293e Templates: Fix sample wizard
Change-Id: I9c388478b2a5491f42bc653d5925b6b01ab83831
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-11 12:06:44 +02:00
Tobias Hunger
8f1ca2216a IWizardFactory: Add a feature for all running plugins
Get rid of IFeatureProviders that are only telling the wizard factory
that a plugin was loaded.

Change-Id: Id12c669974a6ab98036f070e1adcae35b34ca376
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-21 09:52:13 +02:00
Tobias Hunger
e5bef06d6e Wizards: Use configured extensions for c++ sources and headers
Task-number: QTCREATORBUG-12309
Change-Id: I3d6ebe84408427b5a4e499a6d38ef5f37711610e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-05-27 15:39:38 +02:00
Daniel Teske
7e8a945e6e Html5Wizard: Remove it
This wizard is from a different era. Nowadays webkit is on the way
towards deprecation and the replacement isn't ready yet.

Change-Id: Ifac9a42463562fefaa4a33eb7be2a09e0d8af1aa
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-27 10:04:41 +02:00
El Mehdi Fekari
03ffc4eaf5 QNX: Use one single bar descriptor when deploying
No more generated bar descriptor file. The default bar descriptor
should be the same one used when packaging and all changes
should be visible to the user.

Change-Id: Ib0eb1dc2ad2d49e159fa1b6009bac2e0d2569c5a
Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
2014-05-26 14:05:54 +02:00
Kai Koehne
fec00e295d Simplify templates to use qrc:/ instead of qrc:///
Both forms are functionally equivalent, but the official documentation
favors the shorter one.

Change-Id: I2b6fccfafc2474f5b61ed6dce460b0472a63854c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-05-21 12:23:18 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
Orgad Shaneh
82aa1380f2 Cleanup whitespace
Mostly trailing whitespace

Change-Id: Ic324d20e8159c9d255895248ce04f25c692daf46
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-05-16 14:27:13 +02:00
Orgad Shaneh
6aad96d89b Nuke plugins PROVIDER settings
Place all plugins in lib/qtcreator/plugins

Change-Id: I66606910104b28d91038f5607850ce03bdd1b80f
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-05-08 15:29:11 +02:00
El Mehdi Fekari
7a45450831 Qnx: Properly setup the environment vars in the bar descriptor
The environment variables in the bar descriptor are modified
depending on the Qt deployment option the user selects.

This causes inconsistent behavior if the user modifies those values
on the template file. The env var values will be generated
in the final bar descriptor without being visible on the template
to avoid any user modifications that won't apply correclty.

Note: For next releases, the bar descriptor needs to be handled
properly to avoid any black magic so all modifications should
be visible to the user.

Task-number: QTCREATORBUG-11916
Change-Id: I00a2c855be3def31cd008071c6269e5a69f81536
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-05-02 12:05:55 +02:00
Christian Kandeler
c2d20e49dc Support deployment in "plain C" and "plain C++" app wizard.
For qmake, that is. The qbs versions already have deployment support.

Change-Id: I75d9bf0a36285a5e04e0fb7f13fca304d74efdc9
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-04-28 15:36:07 +02:00
El Mehdi Fekari
d9548d6422 Templates: Set correct settings for qnx target
Task-number: QTCREATORBUG-12013

Change-Id: I6b8fa2409b2a6530267717879d82713313ae6672
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Vladimir Minenko <vminenko@blackberry.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-14 08:43:37 +02:00
jkobus
96367b6253 Do not use a qml subfolder for qtquick applications.
The subfolder triggers some unfortunate issues, like that the default
path that is chosen for adding files to the '/' prefix in the qrc is the
project directory.

Change-Id: Ia0010e01c37afb64506053014eae4524794e57d8
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-04-08 14:01:39 +02:00
El Mehdi Fekari
866157960a Qnx: Update bar-descriptor templates
* Qt4: Remove unnecessary input and update the style to bb10dark.
* Qt5: Update the environment variables default values
to cover common use cases.
* Cascades: Remove unnecessary LD_LIBRARY_PATH input

Change-Id: I339ae02639621adf291f5d3c9a02a242460f0c39
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
2014-03-27 17:06:22 +01:00
Jarek Kobus
a6f12b3555 Replace qtquick 1.1's deployment with qrc file.
Don't generate Qt icons for Qt Quick App projects anymore.

Change-Id: Ic0fc43235a5b8da6696d5eb8d4a765d49b03dfd1
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-03-20 19:59:46 +01:00
Marco Bubke
0853ffadc4 Change the priority for qml wizard templates
The control templates should be come first.

Change-Id: Ieb5f0b22f47c0ec2113c4722d96e878d167c8f3e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-06 18:58:13 +01:00
Marco Bubke
57591442a0 Change priority of qml application templates
The Window element is not working in the qml designer. So it would would
be nice to have a default template which is actually working.

Change-Id: I7eae41d9ccc1c0cc8b65a6eed3f999e45b396291
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-05 15:29:11 +01:00
Marco Bubke
2784d750cf Make qml template more designer friendly
If you open the qml file in the designer and want to move the text item
you move the mouse area instead. I think it is not very intuitive.

Change-Id: I41457e4f42a145433189ac45768e345ac73b262e
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-03-05 15:28:57 +01:00
Joerg Bornemann
549ea6a3c8 qbs templates: install app by default
Change-Id: Ib639f70f2cb30842d8bce2073883979d0b67afa7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-03 13:36:12 +01:00
hjk
d9f6b7da2a Templates: Remove 'Module/' part from #includes
That was not recommended practice for user code.

Change-Id: I68c2471444dd6c6fc0b6cc64df9a677947863973
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-24 10:16:01 +01:00
Tobias Hunger
354559aa71 CustomWizard: Use object pool to find factories
Rename class type of CustomQmakeProjectWizard from "qt4project" to
"qmakeproject" and document that change in the manual and changes-3.1.0.

Also update all the in-tree xml files to that new class name.

Change-Id: I7a9ef914a429d68e7f37a2115c03fa81d7433398
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-17 11:00:58 +01:00
jkobus
6b7c429c11 Make availableFeatures() nicer
Change-Id: Ia25c0967e6f65cb046c9f3b1798c747b8da02fc9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-14 12:45:28 +01:00
jkobus
e04f884220 Update qtquick features number
Task-number: QTCREATORBUG-11465

Change-Id: I17653a10e8d844e94be294d66d59f3235631ccb0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-13 14:35:32 +01:00
Tobias Nätterlund
6b8b60cef6 BlackBerry: Improve handling of Qt libraries when creating package
This lets the user choose between bundling the Qt libraries in the
bar package, use the libraries shipped with the device, or use
libraries deployed to the device by the user.

From the user's choice, the correct assets will be added to the bar
package, and the correct environment will be set up, so those does
not have to be pre-filled in the bar-descriptor.xml template any longer.

Task-number: QTCREATORBUG-11376
Change-Id: If44a9f9868d068f2ccbbeca3e25447496a336648
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2014-02-13 09:29:38 +01:00
jkobus
62117ee21f Fix deployment for QtQuick templates
Task-number: QTCREATORBUG-11412

Change-Id: Iee117faaf85fcaa3e216091a8f7d95b4e12237cb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-02-11 13:11:32 +01:00
Jarek Kobus
d583900297 Get rid of Qt Quick Ui template based on QtQuick 2.0
Change-Id: Ifa134618cf84f3ec71d443fc3d8bb0fba2768ea8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-31 16:40:55 +01:00
Jarek Kobus
848a725e3b Use qrc files for qml files inside qtquick app templates
Remove unused application viewers

Task-number: QTCREATORBUG-11264

Change-Id: I3e24be9b58ef47cb2b2c2cce0361c08e71c93ee9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-31 13:24:23 +01:00
Eike Ziller
851f255b9d Merge remote-tracking branch 'origin/3.0'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp
	src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp
	src/plugins/qmlprofiler/qmlprofilertraceview.cpp

Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
2014-01-15 14:04:41 +01:00
Fawzi Mohamed
4424397ee4 templates: fix controls template for ios
Task-number: QTCREATORBUG-10873
Change-Id: Idb20aece719bedbf4b505e6500ec62a7be916c11
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2014-01-08 16:27:48 +01:00