Commit Graph

599 Commits

Author SHA1 Message Date
Jake Petroules
b0229acd54 Clean up projects wizards and support for Qbs+CMake+qmake to all
Task-number: QTCREATORBUG-17308
Change-Id: I5d320a52f2cc5c0adbaf513985e4be0d75219a7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 18:19:57 +00:00
Christian Stenger
ae98cd6f2b AutoTest: Enhance wizard to support Qbs
Task-number: QTCREATORBUG-16916
Change-Id: I9f77dc2d4601ca8ff8db6847ee23d7f49e3bce81
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-26 13:51:38 +00:00
Christian Stenger
9487bb0e89 AutoTest: Fix condition in pro file template
Change-Id: I89c4e5f8d1df98f474bb843a80ecd709b3fbcc9d
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-26 12:28:19 +00:00
Thomas Hartmann
5762182e23 Wizards: Increase QtQuick.Layouts version for controls 2 wizard
Qt Quick Controls 2 came with Qt 5.7, so it is save to use
1.3 for layouts.

Change-Id: Idb500154800312de0c1b2664f44113026525581d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-23 10:22:15 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Eike Ziller
d3f725f39d QtQuick Wizards: Update available Qt versions
Change-Id: I0546cfd965a450a9844b42a2c5e869dbb3447063
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-09 14:26:58 +00:00
Tim Jenssen
0a30595107 Wizards: remove qtquick1 extension
Change-Id: I3b730e5ffd398462e6a41e0c0c20ab3506e1745a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 09:42:28 +00:00
Tasuku Suzuki
48adeb1a82 Wizards: replace string literal to QQmlExtensionInterface_iid
Change-Id: I36c4c2e98f2b6bd807a6e19398ba8ad2406ccf09
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-16 15:16:55 +00:00
Thomas Hartmann
91bce7abef QmlDesigner: Removing wizards for QtQuick.Controls 1
Change-Id: I29d588021a5bf44af7a8f53e71363b96713d576c
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-30 15:21:32 +00:00
Tobias Hunger
565aed03a2 Wizards: Use filename, not baseName for license headers
Task-number: QTCREATORBUG-17343
Change-Id: I23ae4b510bb2dc81bd34253e8129ba148ae92021
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-25 15:20:15 +00:00
Orgad Shaneh
9c09ca9e42 Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia98031eb87f1859c3736faa0cdd8b655e8a50689
2016-11-14 11:17:13 +02:00
Filippo Cucchetto
1a1cf3c12b Nim: Added support for nim script files
Added a new entry inside the "New" menu for creating a new nim script file (*.nims)
Added support for editing them inside the editor

Change-Id: I09a514fdd4e4a0e9a78bb557db3e8c7e97683b8d
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-11 09:23:12 +00:00
Tim Jenssen
ffe305527b Wizards: remove default icon
Change-Id: I665ccb887294885758b45b0bd272620e1a796eec
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-10 15:45:09 +00:00
Eike Ziller
30f71eddf8 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: I245212bd45104636b1c9737b36d3db3e4af23092
2016-11-01 09:30:49 +01:00
Eike Ziller
2d6f33a92b Merge remote-tracking branch 'origin/4.1' into 4.2
Change-Id: Ic536dc74b969dce910ec6b91e5a308e97348b8bf
2016-11-01 08:44:04 +01:00
Tobias Hunger
e6d553ce59 Wizards: Explicitly list sources in CMakeLists.txt
Task-number: QTCREATORBUG-17196
Change-Id: I478f2f945a6f7ee3183aa09871bccc7e475e5501
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:31 +00:00
Tobias Hunger
137695cae7 Wizards: Move cmake required version before project line
This is apparently necessary to establish policy before setting up
things.

Task-number: QTCREATORBUG-17197
Change-Id: I8b12e752e05e65b2275c0a97cf1b727f60c88cd0
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-10-31 10:09:25 +00:00
Tobias Hunger
9e72dc343c Wizards: C++11-ify code generated by JSON wizards
Task-number: QTCREATORBUG-16983
Change-Id: I1f936f25f4e9756239e04d677cec92316e3dc75b
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-28 11:07:23 +00:00
Tobias Hunger
63c339ffba Wizards: Generate header guard of cpp classes based on header file name
Generate header guard of cpp classes based on the header file name, not
based on the class name (plus the preferred extension for header files).

Task-number: QTCREATORBUG-15864
Change-Id: I8c2b5d4a78e59a2389091ed5933b5bdeae8e5730
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-10-26 14:05:24 +00:00
Giuseppe D'Angelo
e9aaf017c2 Project wizards: warn when using deprecated APIs in new projects
As discussed at QtCS, almost none of our users know that they can
get warnings when they use deprecated APIs, and/or disable them
altogether. A first step would be getting the relevant defines added
by the new project wizards.

Change-Id: I5d4260b5aa094ac2a077b7b00eaa577108e5f612
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-25 12:00:16 +00:00
Thomas Hartmann
3735506400 Wizards: Add empty QML_DESIGNER_IMPORT_PATH to templates
QML_DESIGNER_IMPORT_PATH can be used to create "mockup" QML files,
just for Qt Quick Designer.

Change-Id: Icd0c4143031a4b49afb89a2465622bdf2376745f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-10-24 12:12:46 +00:00
Andy Shaw
c1e600a41d Remove the qt keyword from CONFIG
This is already implicitly included, however since the placement
of it can interfere with the qtquickcompiler, it should be
removed.

Change-Id: I270fa0093ad8a7739f4f25bbef477560003e2d01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2016-10-24 08:52:39 +00:00
Tim Jenssen
462948f53e Wizards: remove Qt Labs Controls wizard
It was just a testballoon and they are living as
Qt Quick Controls 2 in newer Qt versions.

Change-Id: I9645a092dcddf498df93f13a543a6bb92d8a419d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-09-28 11:42:19 +00:00
Thomas Hartmann
324aa339a0 Adding ini file for styles to Qt Quick Controls 2 wizard
Change-Id: Ie3dd0c4422d402f811830d9d24382550ba560df0
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-09-23 10:47:14 +00:00
Eike Ziller
112bdc0f88 Merge remote-tracking branch 'origin/4.1'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28
2016-08-15 14:42:47 +02:00
Eike Ziller
9142934d8e Merge remote-tracking branch 'origin/4.0' into 4.1
Conflicts:
	share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I0ece46a7df3b5a6e045b30db60e608212a40cc4d
2016-08-15 14:34:25 +02:00
Alessandro Portale
486c3670cf Fix the QmlProject app wizard
Change-Id: I710b446b5e4346b45f1aa4c7a851428b6bc57454
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-08-11 16:44:05 +00:00
Alessandro Portale
4556cee18e Qt labs Controls App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: Ibd78ac216841c1c05128272abfa7b86a14131022
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-11 08:43:24 +00:00
David Faure
252a3f89c6 Fix wrong code in list/table model templates
rowCount should return 0 if the parent *is* valid, and return
the actual number of rows when queried with an invalid index.

Change-Id: I00e3d4ea79e1aaf0be1974da876c5a871d3924e6
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-08-10 16:13:40 +00:00
Alessandro Portale
809257ca1b Qt Quick Controls 2 App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: I1610575729b1a2bd570ef7d7b6870f579f5e34f0
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-10 15:53:40 +00:00
Alessandro Portale
b18e084fc0 Qt Quick App Wizard: Add virtual keyboard for Boot2Qt
If the Boot2Qt plugin is installed, the wizard generates the required
code to instantiate the virtual keyboard and to slide it in & out.

Change-Id: I700a00d60de2936972713bf383570629c8bf678f
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Reviewed-by: Rainer Keller <Rainer.Keller@qt.io>
2016-08-10 15:53:19 +00:00
Orgad Shaneh
1853f01a5b Merge remote-tracking branch 'origin/4.1'
Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
2016-08-05 11:40:07 +02:00
Lorenz Haas
69143bc3a9 Wizards: Fix list model wizard's rowCount()
rowCount() must return 0 when the parent is valid: this indicates that
the list's items has no children and thus it is no tree model. The
list's size has to be returned for an invalid parent (== the invisible
root node).

Change-Id: Ieaa884958ea0094aca2232160b6f769bf90514c4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-31 09:23:38 +00:00
Leena Miettinen
e67cb6d521 SCXML: Fix UI text
Change-Id: Ic8c0c27c12bcd9992cf3518087c283606f5acdeb
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2016-07-26 07:36:21 +00:00
Leena Miettinen
41e336f9d7 Autotest: Fix project wizard text grammar and capitalization
Change-Id: I0f3f6ff92200760d4a226bf34a8fd10ca9d8cbf2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-07-25 09:13:56 +00:00
Ulf Hermann
25b9989749 Add wizard and mime type for SCXML
This allows us to easily add scxml files to a qmake project.

Change-Id: I2b5b21683f3e76062e6858fb8d0bceaa699a5569
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-07-14 11:41:05 +00:00
Thomas Hartmann
9b9a647aed Wizards: Remove Qt Quick 1 file wizard
Change-Id: I4ea4ab66cec327ef7a85a46dedb2c21ad3db8912
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-07-01 07:50:44 +00:00
Christian Stenger
63e158b4d4 AutoTest: Enhance wizard to support GTest
Initially this adds basic gtest testing - to be improved later on.

Change-Id: I2121cd24493a8d65c5acd0be5c9dd5858702645d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-27 10:00:49 +00:00
Christian Stenger
eeb1a8fe58 AutoTest: Use json based wizard
Change-Id: I75693037542ef64bcc094e092086dea65d77872c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-23 10:10:23 +00:00
Filippo Cucchetto
94fdd4d900 Added plugin for supporting the Nim programming language
The plugin support:
- basic syntax highlighting
- indentation
- project management
- run and build configuration
- debugging
- code style

Change-Id: Idfbb02a11ed570c90149a54b726beb956712e2bd
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-06-07 07:17:55 +00:00
Orgad Shaneh
33c3a1fbbf Wizard: Use Qt5-style connects
Change-Id: Ibe5d1543e99644ff2c07146b9a83d9fe5b4121e1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-06-03 07:41:53 +00:00
Alessandro Portale
bb0a96a1ba Wizards: Remove deployment.pri. Inline the deployment rules instead.
After having been reduced drastically a while ago, deployment.pri still
contained a fragment regarding deployment. This change inlines the 3
relevant lines into the main .pro file and reduces the size of generated
projects.

One side effect of these new qmake code lines is that if target.path is
defined before them, an install target is created also on non-"unix".

Change-Id: Id0893d563924c1ba9f9599c0bfe5218e82c16d1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-31 08:50:34 +00:00
Eike Ziller
0c5bae640b Merge remote-tracking branch 'origin/4.0'
Change-Id: I80bc3371c6d7cf9f2d46cbcf8e79e4761213d8aa
2016-05-27 12:01:36 +02:00
Takayuki ORITO
6b506b34ec Add properties to template for Qt Quick Application.
It imitate template for Qt Quick Controls Application.

Change-Id: I3440c96f06f3607b43811399427e341e73dea657
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-27 08:48:32 +00:00
Eike Ziller
9b1e2cb48e Add script to create a "dev" package, and allow building against it
Collects all the needed data from a source and build directory,
which then can be used instead of a source directory in combination
with an installed Qt Creator, to build plugins.

On Windows and OS X the plugin can still only built in the same
mode (release or debug) as the used Qt Creator install.

Change-Id: I21119cc0681f1a5f657c969f5d1e7a23d69aedfe
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-20 09:59:35 +00:00
Alessandro Portale
646bf84c60 Wizards: Add an application wizard for QtQuick.Controls.2
Change-Id: I516a0b016d57d997624a449ec58e56e3af3f265f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-19 10:59:17 +00:00
Eike Ziller
9e66ce48e4 Merge remote-tracking branch 'origin/4.0'
Conflicts:
	src/plugins/autotest/testcodeparser.cpp
	src/tools/clangbackend/ipcsource/clangbackendclangipc-source.pri
	tests/unit/unittest/unittest.pro

Change-Id: I9db4fbea6ea7c9fdd0d8e1703735af20c92e754b
2016-05-09 16:37:41 +02:00
Alessandro Portale
5a88d52706 Wizards: Add "Qt 5.7" option to QtQuick[.Controls] wizard
With updated import versions.

Change-Id: I9c69373d31c7e434eb7b9c210606a79be3d1566e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-09 10:00:32 +00:00
Orgad Shaneh
b477eafa1c Plugin template: Minor cleanup
* Remove unneeded include
* Use explicit namespace

Change-Id: If3e0bc279b8b8457ea211aa187ef76f6c52beeb7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-04-28 09:19:11 +00:00
hjk
39a38d5679 Wholesale conversion to #pragma once
Kudos to cgmb and https://github.com/cgmb/guardonce

Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2016-03-30 15:20:19 +00:00