Commit Graph

398 Commits

Author SHA1 Message Date
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
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0'
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
2014-01-08 11:01:06 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
jkobus
d3b8da6cf8 Add qtquick 2.1, 2.2 and qtquickcontrols 1.1
Change-Id: If68e0c62781b235c2f0e573afe6d0e28709f28f3
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-12-05 10:04:31 +01:00
Eike Ziller
920d524d38 Merge remote-tracking branch 'origin/3.0' 2013-12-03 12:46:39 +01:00
Kai Koehne
2d028ceec4 Remove wrong Qt Creator version number from Qt Quick template files
Task-number: QTCREATORBUG-10975
Change-Id: I6eb87a789ce88b1f3f298ef65b8bb96ce2348501
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-12-03 08:52:32 +01:00
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