Commit Graph

532 Commits

Author SHA1 Message Date
Eike Ziller
559e66cb35 Merge remote-tracking branch 'origin/3.0' 2013-11-22 09:11:51 +01:00
jkobus
5bf3ed7c6a Remove unused code
Change-Id: Ie7e2db1416ec2eb51339a05b8af408c18a0cdbf3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-20 12:18:26 +01:00
Eike Ziller
f61e643c95 Merge remote-tracking branch 'origin/3.0' 2013-11-20 11:25:36 +01:00
jkobus
9472e0fd4c Fix paths to deployment.pri, important for templates tests.
Change-Id: Iabcf82b6ea04ba5105767dcc9c9c4e8b272afc18
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-19 13:58:11 +01:00
jkobus
4c9e3bbecf Remove mobility and harmattan leftovers from qtquick app .pro
Change-Id: Id999a376c037c831f0bb8850253c74d16d5c385d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2013-11-19 12:51:48 +01:00
Tobias Hunger
8380cb6e70 Qbs: Mark the plain C and plain C++ project as console applications
Mark the qbs flavors of the plain C and the plain C++ project as
console applications.

Task-number: QTCREATORBUG-10815
Change-Id: Ic143ffe4026a97d0d27e0a85e62724b26e0ea5ce
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-11-19 12:26:58 +01:00
jkobus
3996faa9cd Remove unused attribute
Change-Id: I0cc6c5a63afbcab0e937db7230c1a979a306957a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-19 10:57:46 +01:00
jkobus
9ad57119fa Reorder component set (make Qt Quick 2.0 the default)
Change-Id: I1735a3785e8e96bf3550213c7efbd6b879f61730
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-18 17:09:11 +01:00
Eskil Abrahamsen Blomfeldt
e4ebad5eaf Don't overwrite deployment options for non-iOS unix-platforms
A missing else was causing the else:unix-branch of the ios condition
to always execute for unix platforms, overwriting any of the
settings from before. Result was e.g. that Android builds would
not properly install their assets.

Change-Id: Icf8d2e77ff7eaea478cc2f945d3aee7929cc4078
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-11-15 14:59:41 +01:00
Kai Koehne
3b1b5010c0 Make QtQuick project descriptions translator friendly
Apparently using quotes in the xml file isn't supported ...
This fixes a regression introduced in b863bd02cd.

Change-Id: I166babcd8769d818a7ab488e3dbad432d8b65128
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-13 15:19:58 +01:00
Kai Koehne
b863bd02cd Simplify descriptions of Qt Quick wizards.
The current template mechanism does not support descriptions with
multiple paragraphs. Work around this by making the descriptions
shorter.

Change-Id: I3980778ce3b022430cc838f2c200f003dae0081c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-11-13 14:05:44 +01:00
Fawzi Mohamed
82cc00bfcd templates: fix deployment for ios
Task-number: QTCREATORBUG-10683
Change-Id: I1a7d721430b4a5bd15422d161f58a4247da79e08
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2013-11-13 11:44:39 +01:00
jkobus
c31b03f1d0 Restructure qtquick templates, read them dynamically
Change-Id: I11dfac8ce8d6b1e68df0151516cdc03247fffe3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-11 15:27:35 +01:00
jkobus
ddd6304aa2 Restructure the qml/app/ folders, remove unused meego10 leftover
Change-Id: Ia154a89ea393f09a2878b481274e296924f42d8e
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 15:36:32 +01:00
jkobus
f6aed5c295 Remove unused template
Looks like it's not used anymore.

Change-Id: I6a7f83b0144f6aded6391169deb797ccff24bcad
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 15:20:37 +01:00
jkobus
62590507b1 Merge multi Qt Quick UI wizards into one
Change-Id: Ia984c36864dacd5b71c76976a351767bb4c3693c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-11-06 10:23:49 +01:00
Mitch Curtis
b0b7571654 Fix typo in New Project dialog for Qt Quick UI apps.
Change-Id: I54287e4d6e6d6e6f9dc7575201b8034b365d1c01
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-11-04 15:12:34 +01:00
Frantisek Vacek
ac71bee072 Qnx: Cascades project template is obsolete
Qt Creator QTCREATORBUG-10375

The old Cascades template application was more sample than template
and it was simplified.

The application UI object name doesn't follow the project name anymore.
This change was introduced because C++ class name rules are more
restrictive than the project ones. More than that, it is harder
to start with some test project and then refractor it to some real one.
There is no gain to have UI object class name same as the enclosing
project one.

The application icon added to the bar-descriptor.xml

Change-Id: I198f61a631fa2c758f3e8ac377c06ce7560cc911
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-29 13:45:45 +01:00
jkobus
deeeda162d Remove unneeded space
Change-Id: I7e7335bd8b3ef2816abe07a3c5dc6cf2b86afc3b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-10-25 14:23:34 +02:00
Kai Koehne
9b88e0db32 Update file/directory names for Qt Quick 1 template
Make the names in line with the Qt Quick 2 ones. Also, changing
the directory/filename makes sure the update mechanism of Qt Creator
doesn't update apps generated by the 2.x wizard any more, which
might break stuff.

Change-Id: I4621d5f35eae2102aeba7e77c5cd903511be249f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-10-24 16:58:23 +02:00
hjk
adcee1cb84 Remove qmljs debugging helper setup code from QtQuickApp template
Change-Id: Ia979c37c8f0ae77e2390951a547098461474313c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-10-16 16:35:14 +02:00
hjk
d2b1d7ac0d Remove Meego support from QtQuickApp project template
Also bump the minimum Qt version required for new Qt Quick apps to 4.8

Change-Id: Ieeabc8475ccfa7f9fec7ca08cd88384ed88f0d1d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-10-16 14:49:23 +02:00
Nikolai Kosjar
b8dbac0b9c Rename "[Mm]ethod(s)" to "[Ff]unction(s)"
Only methods as programming functions are affected. Besides renaming
some actions like "Switch Between Function Declaration/Definition" this
mostly touches (api) code comments.

This is a follow-up patch to commit 872bfb7.

Change-Id: Icb65e8d73b59a022f8885b14df497169543a3b92
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-10 15:56:12 +02:00
El Mehdi Fekari
e530071d8d Qnx: Remove BlackBerry Gui templates
The BlackBerry Gui templates are only adding BlackBerry 10 style
which can be done with a standard Qt Gui Application.

Task-number: QTCREATORBUG-10242

Change-Id: Iba29088acc1720318f09138688dd4eae544338a4
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-10-09 23:08:23 +02:00
Rainer Keller
92f9d286ab Fix path calculation for Boot to Qt
Change-Id: I090bfe935c0c69e7689449ef2b76aff7273445a5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-07 16:54:26 +02:00
Oswald Buddenhagen
2f936968e7 make the plugin template not create a _dependencies.pri file
it's pointless and counterproductive for 3rd party plugins.

Task-number: QTCREATORBUG-9192
Change-Id: Id9a59e44fa37d00ff5bd68b4240517f0d014c7a2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-10-02 14:12:40 +02:00
Thomas Hartmann
649e127156 Wizards: Adding application wizards for Qt Quick Controls
Task-number: QTCREATORBUG-9477
Change-Id: I4eaf70089e19f0fcab8d85d9a101f74e119bbae0
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-10-01 20:22:42 +02:00
David Kaspar
ac2e53fdfe Qnx: Fixing bb-cascades-app project template
Now it uses ProjectName:s and ProjectName:h so source code
is generated correctly.

Task-number: QTCREATORBUG-10227
Change-Id: Iecf5250e765def70d7a1d2833a02f3b2a7c3e863
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2013-09-27 14:59:52 +02:00
David Kaspar
3c94b88cef Qnx: polishing bar-descriptor.xml files in Qt5 wizard templates
Change-Id: Ib943bdbfd6ebc7c9dfcbe5fd4995df86a3b73ff7
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: David Kaspar <dkaspar@blackberry.com>
2013-09-10 08:41:24 +02:00
Christian Kandeler
824c6a5c56 QbsProjectManager: Support the "plain C" and "plain C++" wizards.
Change-Id: Idcc8459660526f972949a6f6908acc19bd52a4f7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-29 10:39:29 +02:00
Christian Kandeler
1f007a6264 Consolidate the different "Plain C/C++" wizards somewhat.
We should not duplicate all wizard resources for every supported
build system -- this will not scale. Instead, have one top-level
directory for each type of wizard with build system specific data
in respective subdirectories and common data in another.
To support this approach, CustomWizard now traverses the template
directory recursively as long as no wizard specification has been found.

Change-Id: I8aad8cf36c5bf24d062f2d2c17fdb87ad12fd450
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-07-26 16:14:06 +02:00
Christian Kandeler
080277e8ae Do not offer CMake-specific wizards if that plugin is not enabled.
Rationale:
    a) For people not interested in CMake, the wizards unnecessarily
clutter the UI. If unhandled, this problem would get worse the more
build systems we support.
    b) If such a wizard is actually used in the absence of the plugin,
nothing visible will happen after it has finished, which is guaranteed
to confuse users.

Change-Id: I070409d3185b11d2e04e33927a97843e60c657ff
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-26 15:14:02 +02:00
Thomas Hartmann
f14892d13a Wizards: remove escaped HMTL
Linguist seems to escape the escaped HTML twice.
This breaks  translations.

Task-number: QTCREATORBUG-8923
Change-Id: I820b89d7c8e140115dc8b2cf8ef28db49cfb7102
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-06-26 13:49:41 +02:00
Tasuku Suzuki
4fa2790e53 remove unneeded macro in Qt Quick 2 Extension Plugin
Change-Id: Id3a75a0fb1ff93ffa2c3667f4bf5e9b440396cf0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-06-06 15:43:08 +02:00
Eike Ziller
d8bd56bcd6 Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/cpptools/cpptoolsplugin.h
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/qbsprojectmanager/qbscleanstep.cpp
	src/plugins/qbsprojectmanager/qbsnodes.cpp
	src/shared/qbs

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4e
2013-05-24 16:20:10 +02:00
Thomas Hartmann
2e9f6a7935 Wizards: Adding a title to the Qt Quick Controls template
Task-number: QTCREATORBUG-9304
Change-Id: I9faa92bd9c1107066d7d312008a7e10613b414ff
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-24 08:47:48 +02:00
Aurindam Jana
3f39943a37 CustomWizard: Add a placeholder field for QLineEdit
The XML file now has a placeholdertext attribute that sets
the place holder text for the corrsponding QLineEdit.

Change-Id: I537721a5e5be796f4f88054751e66e557e718948
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 16:16:38 +02:00
Oswald Buddenhagen
6fb94a7b10 Merge branch '2.7'
Conflicts:
	doc/src/qtquick/qtquick-components.qdoc
	doc/src/qtquick/qtquick-designer.qdoc
	qtcreator.pri
	qtcreator.qbs
	src/plugins/cppeditor/cppinsertdecldef.cpp
	src/plugins/qnx/qnxruncontrolfactory.cpp

Change-Id: I0a37a07c42719bc0d9ef5b3ac4641d01a63c0d88
2013-05-15 10:21:47 +02:00
Leena Miettinen
d07d683691 UI text: make descriptive text shorter.
Fix capitalization.

Change-Id: I89c216e07f42c359cd11207d1702efc612db79bd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-14 15:45:17 +02:00
Thomas Hartmann
1aeffb6bb4 Wizards: QtQuick 2.1 import for Controls
Since Controls depend on Qt 5.1 we can use
a QtQuick 2.1 import.

Task-number: QTBUG-31011

Change-Id: I7524c54c3b77ccce89cc57292825f02e163fd7aa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
2013-05-06 14:27:14 +02:00
Eike Ziller
a2171c2d82 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp

Change-Id: I7f319154d5865c47ccfd5f525f0fd7983733dd0e
2013-05-03 09:49:28 +02:00
Thomas Hartmann
e0f50c0468 Wizards: Adding simple wizard for QtQuick.Controls
Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-05-02 17:14:26 +02:00
Kai Koehne
369351cbf2 Make sure QtQuick2 plugin is installed into right directory
Task-number: QTCREATORBUG-9229

Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
2013-04-30 16:39:41 +02:00
Eike Ziller
bedc477943 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104
2013-04-30 11:43:33 +02:00
Eike Ziller
38b61177f6 Merge remote-tracking branch 'origin/2.7'
Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692
2013-04-23 11:13:25 +02:00
Tobias Nätterlund
874328fe9b QNX: Corrected path to qml files for pure QNX devices
For pure QNX (non-BlackBerry) devices, the path to the QML
files are decided by the user. Only adjust the path for BlackBerry
devices.

Change-Id: I909ed0a06bc6985a5a353aab61bda395afcfb7aa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
2013-04-23 10:38:19 +02:00
Tobias Nätterlund
53fb29bdda QtQuick2ApplicationViewer: properly resolve install paths
This is a port of commit 2982545d to also apply it to
the qtquick2applicationviewer.cpp template.

Change-Id: Ia9d964d9fc98ea957c52aea783c6148449552755
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-23 09:19:46 +02:00
Eike Ziller
0d5c886af3 Adapt the Qt Creator plugin project template to recent changes
Change-Id: Id5cc8642547a3698d2e11b956f0c1cfe3e8bea1e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-19 13:30:04 +02:00
Friedemann Kleint
a0696ada0d Fix texts in QtQuick-Extension plugins.
The text needs to be one line for the translation transformation
to work.

Change-Id: Ia1c4ab02a0774bebbc6b0f59f2a9682d0a751e6a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-04-16 09:28:04 +02:00
Friedemann Kleint
8ba344a556 Code snippet wizard: Add newlines to template code.
Change-Id: Iaf673ed279103acdae15e868651ffb65397a4221
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-04-11 11:51:12 +02:00