Commit Graph

543 Commits

Author SHA1 Message Date
Niels Weber
8ac1f8eb29 Correct capitalization in wizard template and example.
Change-Id: I9a42ea97407179911d1736ba1ca79402d51d24c5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-16 10:59:41 +00:00
Niels Weber
fd085ed268 Use "OS X" correctly in plugin template
Use Apple related terminology correctly.

Change-Id: Ib71fa5a080586027b3be8303ba5b7cf8058e669c
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-02-15 13:08:37 +00:00
Eike Ziller
63c1660067 Add autotest plugin
Change-Id: I904289a6cc6f14eb9fa46c3ce757e4ebc3a36f55
2016-01-22 15:25:30 +01:00
Eike Ziller
a73871d91c Fix wrong location of templates
Change-Id: Id7732ef0914ba69eae020feb412cbce7cf9a5902
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2016-01-22 14:16:45 +00:00
Robert Loehning
c594d27c68 Small string improvements
Change-Id: Iad60750b4c4164b074a3b0203e4121e8586909de
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2016-01-20 13:22:28 +00:00
Tobias Hunger
38cce7eb83 Update License according to agreement with Free Qt Foundation
* Update all files in share folder

Change-Id: I8a82c3eb2eb614d4339dd4c4e690f54b5f29d813
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-01-19 16:05:29 +00:00
Tobias Hunger
aa37df645d JsonWizard: Update to use supportedProjectType
Remove "kind" as that is no longer necessary (even though it is still
handled if that is in the wizard).

Change-Id: I3e56d5e0d936b622dae5091950427f9b2db60695
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-19 15:20:55 +00:00
Eike Ziller
4255493881 Merge remote-tracking branch 'origin/3.6'
Change-Id: Ia5e169a276e21db59b4b26a1ed3f253bff9e2ab9
2016-01-14 09:32:17 +01:00
Alessandro Portale
0118bc290a Qt Quick Application Wizards: Add Qt 5.6
...also for qmake based projects

Change-Id: Ib8cab74a8b2249a13175593b27f228b4c7bc0052
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-01-08 13:31:38 +00:00
Eike Ziller
ad6c0f9bc6 Merge remote-tracking branch 'origin/3.6'
Change-Id: I8f034f91de04e319dd5ba24b8837f1daca54d918
2016-01-07 11:01:14 +01:00
Alessandro Portale
daab642100 QML project Wizards: Add Qt 5.6
Change-Id: Iaf56de6330c65f71c936dec0b98d9e2331a17da2
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
2016-01-05 16:47:59 +00:00
Tobias Hunger
293cc57064 Modeleditor: Use a JSON-based wizard
Use a JSON wizard in favor of implementing the same thing in
code.

Change-Id: I5952bf417255fb75378e42e3e80b13c0a0d3d317
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-12-21 08:29:47 +00:00
Martin Kampas
5077081319 Wizards: Fix inconsistent category display names
Change-Id: I24d0744351d0065793b8ccb65ba83d8a499f28dd
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:22:45 +00:00
Martin Kampas
f00280d11d qtcanvas3dapplication wizard: Fix typo ${} -> %{}
Change-Id: I248a12ac502d66c331f4584c84ee8a1f1f4ac0a4
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-11-20 11:21:39 +00:00
Tobias Hunger
660bae3a4c Wizards: Fix qmlproject wizards again
Task-number: QTCREATORBUG-15242
Change-Id: I04269e41f596ed79478c53f27aaaa7a212113772
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-28 12:13:37 +00:00
Tobias Hunger
6c83796896 Wizards: Fix QmlProject wizards
Task-number: QTCREATORBUG-15242
Change-Id: Iac6829cbc805a111c0b359ed871f53b1be7053b0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-27 17:22:46 +00:00
Tobias Hunger
9035e77800 Wizard: Add a wizard for item models
Task-number: QTCREATORBUG-7
Change-Id: Ibc06eda1b6596b08dd2e3be4e426c8b89be31064
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-21 13:57:24 +00:00
Tobias Hunger
14eafd5dca Wizards: Use C++11 in all qmake projects created by the JSON wizard
Change-Id: Idbe9053514ec94880df2d89a10ebe9bd4d9393b6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-20 15:46:48 +00:00
Mitch Curtis
e2d0960d77 Add .directory files to git.ignore
These are created by the Dolphin file manager on KDE.

Change-Id: I292bab5fdde43a5bd65f32babbda279c5adeabad
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
2015-09-30 08:54:27 +00:00
Tobias Hunger
bd5becfe18 JsonWizard: Update wizards to make use of new features
Change-Id: Id8117ba92db46012b536c2af4e62f364631d949a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-22 09:16:57 +00:00
Tobias Hunger
dfa2bc5b71 Wizard: Do not set c++11 for the plain C project wizard
... when building with qmake. All other buildsystems do not
have that problem anyway.

Task-number: QTCREATORBUG-15064
Change-Id: Ie7d5b1b8a497db841c340229dff577de9e580171
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-09-17 12:44:28 +00:00
Tobias Hunger
4345b37bf1 Wizards: Rename all qml template files
The QML lint does pick up the QML template files from the wizards
directory and complains about those when opening Qt Creator. So
rename them.

Change-Id: Ifa7a6006c222bf7b30c41097b07167c845bf7a48
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-14 09:19:29 +00:00
Tobias Hunger
6bb78124ab Plain C/CPP Wizards: Use proper main signature
Change-Id: I1d6e83cda2685201aa4126e993dac85cda8315b3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-09 11:24:29 +00:00
Eike Ziller
c868b9f3ed Merge remote-tracking branch 'origin/3.5'
Change-Id: Ife5fdcd71b0adc99d4297a28a64515e9e93d7864
2015-09-04 09:19:28 +02:00
Miikka Heikkinen
2a2902dedb Update three.js in Canvas3D project template
Change-Id: I33d97c830d5bb63e75e1e17d908756bbc664747e
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-03 12:53:29 +00:00
Miikka Heikkinen
b5cd5a970c Update Canvas3D project wizard templates
Added new version of three.js that supports Quick items as textures,
and unified how three.js and non-three.js examples generated by the
wizard look like. Both now display just a plain green cube.

Change-Id: Iedc2498853aa078fe072083ab06a27d1ed04d982
Task-number: QTCREATORBUG-14824
Task-number: QTCREATORBUG-14825
Task-number: QTBUG-47961
Reviewed-by: Tomi Korpipää <tomi.korpipaa@theqtcompany.com>
Reviewed-by: Pasi Keränen <pasi.keranen@digia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-09-02 09:54:14 +00:00
Tasuku Suzuki
f598101284 QtQuickWizards: Fix compilation
compilation fails when "Use Qt module in #include directive" is
enabled.

Change-Id: If8d59e631fc58d4400bf0597e415e66c9fb5279d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-09-02 07:29:51 +00:00
Eike Ziller
3b1a966cc8 Merge remote-tracking branch 'origin/3.5'
Change-Id: Iebaabfc2f724cd493b7cab025406531cea5cd2dc
2015-09-01 12:57:51 +02:00
Tobias Hunger
438c826859 CppClassWizard: Do not add signal/slot to non-QObject classes
Task-number: QTCREATORBUG-14959
Change-Id: I95920a8cb48facf086fbceae3e029bab30c23821
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-27 12:59:24 +00:00
Jake Petroules
46910b46c3 Adapt Qbs code to latest changes.
type: application actually does nothing now, as the application type is
used for both bundled and unbundled products on Apple platforms.
Instead, consoleApplication being set to true influences Qbs not to use
a bundle.

cpp.infoPlistFile became bundle.infoPlistFile in Qbs 1.4.

Change-Id: I6540aa91b2db61ed4cbf2ff30bd46d69db5f9d92
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-08-21 20:51:12 +00:00
Robert Loehning
c0484b992e CustomWizard: Update readme after removal of examples
Should have been done in
b5e3f2e57b

Change-Id: I1ca04d82a9717ce4649537fd4c80c81eca60f0d0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-08-06 13:40:27 +00:00
Tobias Hunger
4dbc0bdbf7 Wizards: Do not offer UI files in Qt Quick projects based on qmlproject
Task-number: QTCREATORBUG-14712
Change-Id: Ic171cbeb4b5e4c52f872c7c4ccedcbfa61be4ab8
Reviewed-by: Robert Loehning <robert.loehning@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-17 11:02:19 +00:00
Tobias Hunger
dbe4e32201 QML wizards: Do not offer .ui.qml files for Qt 5.3
Qt 5.3 is the only version we are going to support that does
not offer ui.qml file support. So just check for the QtQuick
version shipped in Qt 5.3 to decide whether or not to display
the checkbox.

Task-number: QTCREATORBUG-14712
Change-Id: Ibb2204f2bcff819b749e1ed744c14a2e96769351
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-15 10:14:43 +00:00
Tobias Hunger
f36e79cfa2 QtQuick*Wizards: Do never show an empty version dropdown
Always list all minimum Qt version options and pick the lowest by
default.

The wizard will be listed with no platform set and needs to do
something then. Before it did show an empty combobox and behaved
oddly from that point on when no kit with a Qt >= 5.3 was found.

Now it lists all possible versions and offers to set up kits for
you via the kits page when no matching kit is available.

Change-Id: I978268a2b8f1dfcfc8640460d905652abe91f1ae
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-09 09:18:18 +00:00
Alessandro Portale
14ecd1855d Wizards: Add QtCanvas3d application wizard
This change adds the wizards from qtcanvas3d/creatortemplates (a plain
Canvas3d application and a three.js application wizard) in a combined
form as json wizard.

Change-Id: Ieef2fe388bff279b6a158097c094dae212bf89cb
Reviewed-by: Titta Heikkala <titta.heikkala@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-07-06 11:03:48 +00:00
Tobias Hunger
2e6855249f PNG: Run pngcrush on images with iCCP or sRGB profiles
This quietens warnings from libPNG during startup and shrinks the
image sizes.

Change-Id: Ieb4cb5e8ba30b99653896e283c2fb2cc267257f2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-07-03 09:50:46 +00:00
hjk
1a04e06b45 Re-enable QmlProjectManager by default
Acting on user feedback.

This essentially reverts commit 7e8fb3a9e9,
but demotes the wizards from "Application" to "Project" and adds
a tooltip in the hope to make "accidental" use less likely.

Change-Id: I385bcfc5cdcb9bb3c36f9168a7fc6480f4fc5062
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-07-02 06:46:46 +00:00
Tobias Hunger
6b6091ea61 Replace several "Plain C++" with one JSON wizard
Change-Id: Ia08f2127cdb25785cf313ec0a31a3d9775161c9b
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-07-01 13:45:01 +00:00
Tobias Hunger
d41c634be0 QtQuickWizards: Fix versions and make minimum Qt version work
Task-number: QTCREATORBUG-14575
Change-Id: I9ace40e71b8b1d1f753966bb73f0269c4f918afa
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-25 14:13:19 +00:00
Tobias Hunger
e509441e4f JsonWizards: Only show wizards with Qt versions that support them
Task-number: QTCREATORBUG-14216
Change-Id: I7e9e760f7ba9ef6022e76f1600e473a5f54c9893
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-17 11:29:39 +00:00
Tobias Hunger
0c2b1287c4 JsonWizard: Make minimum Qt version work
Task-number: QTCREATORBUG-14487
Change-Id: Ic858b131abb2802cb7bfedf58f64c644ea2085e5
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-06-17 11:28:56 +00:00
Tobias Hunger
828b0de5db C++ class wizard: Do not add Q_OBJECT macro for non-QObjects
Task-number: QTCREATORBUG-14515
Change-Id: I02e423acc53ae23169399bc9b86b4753cb84f7a2
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:20 +00:00
Tobias Hunger
bcc3cc992b JsonWizard: Make description on projects page default to the wizard description
Change-Id: Icb8a4856dda4298b3ee901bc7a5c22190ddca5a6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:53:02 +00:00
Tobias Hunger
f68704f8fd JsonWizard: Make checkbox default values true and false
That is closer to what a user expects than the "0" and "1" used
before.

Change-Id: I08b3a7b0361dd54b75ee7b2213b3d120fb016bf5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:54 +00:00
Tobias Hunger
f76b9b549c Move plain C application wizards into one Json Wizard
Change-Id: If01fe6722c76df83015afa68b18d62ff1eaf523f
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:52:44 +00:00
Tobias Hunger
f1f2475d3e JsonWizard: split plugins and features when considering enabled state
Now that we have the infrastructure to handle both separately it makes
no more sense to merge them.

Change-Id: Ia2694eef60c0fe17b025e4d6766c7a8f775513f5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-28 15:50:24 +00:00
Tobias Hunger
d7b70000ac JsonWizards: Move .gitignore template file
Change-Id: I8c225ace7e8ad991e50ed5c23884f423a5cbb80d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-27 14:11:35 +00:00
Tobias Hunger
b5e3f2e57b CustomWizard: Remove example wizards
We do not want to encourage the use of custom wizards, so
remove the examples. The Json wizard has already enough
real-world examples IMHO.

Change-Id: Ic755e01ce0430b90ad4d5ea3496c11ce162249bf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-26 11:24:56 +00:00
Tobias Hunger
9c1f96d47a IWizardFactory: Remove class wizard kind
Map existing class wizards to file wizards. The separation has never
been clean anyway. Now "file" wizards create one or more files,
"project" wizards create a complete project (something that can be
opened as a project in Qt Creator).

Change-Id: I0562f26019b54a59d46814a13a0b2fa8995c3e0f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-26 10:17:30 +00:00
Tobias Hunger
34008650df Wizards: Make sure wizard ids are unique
Replace existing wizards with new ones of the same id.

Change-Id: Ia17e6a4df5e7c8b647eccbe3bfb13e1c5b2d09e0
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-22 15:54:11 +00:00