Commit Graph

41 Commits

Author SHA1 Message Date
Friedemann Kleint
2f3730ca47 Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.
QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
2012-10-18 11:47:47 +02:00
Kevin Krammer
2910233e52 QNX: use QmlApplicationViewer provided by main QtQuick template
Reuse the QML application class provided by the standard QtQuick1
template.

Extends qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp with
code paths for Q_OS_QNX

Change-Id: I04a283078299f662d630d9387cedc65100f545a0
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2012-10-15 21:07:01 +02:00
Alessandro Portale
ae23d50576 Removal of Symbian support
Qt Creator's support for Symbian was at its peak in version
2.4.x. Nobody really verified it in Qt Creator 2.5 or 2.6.
It is most likely rotten. Let's remove it!

Also, the Symbian support code was spread throughout the whole
Qt Creator code base. The plugin interfaces evolved in the
meantime and target platforms like Android or QNX have 99% of
their code in separate plugins.

In case anyone wants to revive Symbian support in Qt Creator,
please create a plugin for it.

Change-Id: I56a758a3e2fd5b8c64d9aeb8f63d8e916c4883be
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 13:42:42 +02:00
Alessandro Portale
0418e6dc64 Making the QmlApplicationViewer Qt5 compatible
This patch makes a "QmlApplicationViewer" based application from
the Qt Quick app wizard buildable and runnable with Qt5. Note,
that this is still QtQuick 1.1. We are still missing a QtQuick 2.0
based pendant of QmlApplicationViewer.

In addition (separate patch), we may want to tweak the wizard
flags in a way that the wizard allows to create a "Qt Quick 1"
application for a Qt5 target. (Or perhaps we explicitly do not
want that, because we want the developer to use QtQuick 2 with
Qt5?)

Change-Id: Ie3fc8a77a1ff4fba3244f2047d2685c570014356
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-22 12:17:37 +02:00
BogDan Vatra
a16d355dce More Android fixes, add default android device.
Switch to new android assests scheme

Change-Id: I34bf52cbb085b76df66e40391160d189301aafd2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-04 11:26:56 +02:00
BogDan Vatra
50e8f7bb7b Android plugin
Change-Id: Iad58914f067a6ef6d3412ccd42f757d821e39e45
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-24 12:25:40 +02:00
Juhapekka Piiroinen
0de8f96737 Updated MeeGo 1.2 Harmattan QtQuick application template.
Includes an updated MeeGo/Harmattan application
template for QtQuick application wizard.

Change-Id: I746ccea7c0f680f5b4b177481b7eb18f861ad136
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-24 08:01:40 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Alessandro Portale
051569b998 Mobile app templates: QString::fromLatin1 instead of fromAscii
Task-number: QTCREATORBUG-6879

Change-Id: I0a98df8a7bfd588909886b322e0b87106a4f4c37
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-02-06 17:39:07 +01:00
Leandro Melo
3b67e5dd37 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/plugins/projectexplorer/gcctoolchain.cpp

Change-Id: I516c496175afe94c57b8a1dd978d9c5cccc44610
2011-12-21 17:17:14 +01:00
Kai Koehne
42a63064e1 QtQuickApp template: Use === where possible
Prevent QtCreator from underlining this template code.

Change-Id: Ic499db77a0fbbc8344d98ecca25e6c9f4277ee0f
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-19 15:33:58 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4'
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
2011-11-18 10:16:49 +01:00
Alessandro Portale
adc52bf783 Let the Qt Quick Wizard output import QtQuick 1.1 (instead of 1.0)
...and add a comment to change it to QtQuick 1.0 if S60 5th Ed or
Maemo are supposed to be targeted.

Task-Number: QTCREATORBUG-6528
Change-Id: I1936f2a5c9725f34b5a8ad4469465f5e2b645957
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-17 16:36:50 +01:00
Alessandro Portale
b41237f01e Don't use MDeclarativeCache::qDeclarativeView()
Commit d687d11240 unfortunately caused
two severe regressions for MeeGo:

QTCREATORBUG-6473: The application creates two QDeclarativeViews
QTCREATORBUG-6490: QDView functions inaccessible. Existing apps broken

This commit removes most of d687d11240
just leaving the boosted QApplication. Now, QmlApplicationViewer *is*
again the QDeclarativeView.

Change-Id: I219540353ff4dd1061221d6cbe69ce9a58500e91
Task-Id: QTCREATORBUG-6473
Task-Id: QTCREATORBUG-6490
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-16 13:15:04 +01:00
Eike Ziller
85cf2b661e Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/qmljs/qmljsinterpreter.h
	src/plugins/debugger/qml/scriptconsole.cpp
	src/plugins/git/gitplugin.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h

Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
2011-11-11 09:46:25 +01:00
Alessandro Portale
9e13fa077e Fix default mainqmlfile in the qtquickapp template
The template itseld is a valid, working project. Since it makes
template development easier, I prefer keeping it working.

Change-Id: I1ca7815e272fb87460319a388e9c57a8e0391b96
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-08 11:48:37 +01:00
Alessandro Portale
c54444dc97 Use QString::fromLatin1 instead of QString::fromAscii
There is no good reason to break the Qt coding style, here. The
strings "%1/../Resources/%2" and "%1/../%2" are Latin1 aswell
as Ascii.

Change-Id: Idbf3b7650fd650f93293496839fec4d21626cd0b
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-11-08 11:48:16 +01:00
Alessandro Portale
f642280ee5 App Wizard templates: Use com.nokia.symbian 1.1 instead of 1.0
Bumping the minimum required Qt version from 4.7.3 to 4.7.4,
accordingly.

Change-Id: I1f88278552c83ff18f9a710eb1f08b74f43688b8
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-11-03 19:54:44 +01:00
Eike Ziller
b0efd44d20 Merge remote-tracking branch 'origin/2.3'
Conflicts:
	qtcreator.pri
	qtcreator.pro
	share/qtcreator/templates/qtquickapp/qmlapplicationviewer/qmlapplicationviewer.cpp
	src/plugins/qt4projectmanager/qt-s60/codaruncontrol.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp
	src/plugins/remotelinux/remotelinuxruncontrol.cpp

Change-Id: I9c89ba9fa2928e14e148041f9001856dce47a20b
2011-09-15 11:50:29 +02:00
Kai Koehne
cdbb6f2cb9 QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian
The .prf to add the dependency is called qt-components.prf . This broke
building a SmartInstaller package.

Task-number: QTCREATORBUG-6075
Change-Id: I816eac60ab15f40ffc9d3c866f0bf695bfa0983e
Reviewed-on: http://codereview.qt-project.org/4641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-12 11:24:19 +02:00
Kai Koehne
c00ee6701b QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan
Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath

1c93b10b0a/diffs

Change-Id: I4342c567265d192a580d572c6bec8d28ab363120
Reviewed-on: http://codereview.qt-project.org/4275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-12 10:22:06 +02:00
Kai Koehne
d687d11240 QtQuickApp: Tweak template to enable Meego booster
Add support for the meego booster. This requires
 - Telling qmake to link to right libraries
 - Exporting main method
 - using QApplication, QDeclarativeView objects from cache
 - avoiding QCoreApplication::applicationDirPath()

To keep compatibility, QmlApplicationViewer is still derived from QDeclarativeView.
However, if the app booster is used it merely acts as a proxy to the view from the
cache.

Change-Id: I83e285d9ca3c2cfd86d1711e1fb93c72589ba14d
Reviewed-on: http://codereview.qt.nokia.com/3730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-01 13:15:12 +02:00
Eike Ziller
57ae91c5ef Merge remote-tracking branch 'origin/2.3'
Conflicts:
	doc/qtcreator.qdoc
	qtcreator.pri

Change-Id: I8b34546dccc031aeeeab03417e9bd3aa7b740472
2011-08-30 15:59:07 +02:00
Kai Koehne
0c9dc89d0b Qt Quick App: Make sure showFullScreen is used for Harmattan
Make sure that the MEEGO_EDITION_HARMATTAN define is actually
picked up for harmattan (it's defined in qplatformdefs.h)

Change-Id: I3a0710992b5fa3e081821a66e32ed4a73eb5dd6e
Reviewed-on: http://codereview.qt.nokia.com/3595
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-08-25 15:05:41 +02:00
Kai Koehne
2cbc2366a2 QtQuick wizard: Use com.nokia.meego for Meego/Harmattan components
This is the namespace also used in the documentation. On the device, the
components are available both under com.meego and com.nokia.meego, but
mixing these two in one application results in runtime errors.

Task-number: QTCREATORBUG-5850
Change-Id: Ia5db9456c0dd1052042af5a8e8760a34d58b93ab
Reviewed-on: http://codereview.qt.nokia.com/3296
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2011-08-22 11:47:35 +02:00
Kai Koehne
5606b9d239 QtQuick wizard: Fix compilation for QT_USE_FAST_CONCATENATION
Use QString().arg() instead of + , which might be undefined if the
user adds QT_USE_FAST_CONCATENATION to the .pro file.

Task-number: QTCREATORBUG-5796
Change-Id: Ic842cae650c8fa898d72065f3a1c672f5eb893d4
Reviewed-on: http://codereview.qt.nokia.com/2939
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-08-16 08:58:04 +02:00
Kai Koehne
ad3b92b1f4 QtQuickApp template: Don't enable qml debugging for every debug build
This can be confusing, since there is also the switch in the qmake step,
which is on by default for debug builds too. However, if one disables it
you expect that debugging has in fact been disabled.

Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2
Reviewed-on: http://codereview.qt.nokia.com/2511
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2011-08-02 15:40:35 +02:00
Christian Kamm
1126fad923 Wizards: Use showFullScreen for Simulator builds.
Change-Id: Iad67e40f236723ddbeb7633ad950bbb2c5613c4f
Reviewed-on: http://codereview.qt.nokia.com/1507
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
2011-07-12 12:09:10 +02:00
Kai Koehne
5c9b8946ce QtQuickApp wizard: Add Qt Components for Meego/Harmattan
Change-Id: I4809de36e4913037439ab9eb7c56021431cff365
Reviewed-on: http://codereview.qt.nokia.com/704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:50:45 +02:00
Kai Koehne
cdda5c775d Revert "QtQuickApp wizard: Add option for QtQuick 1.1 module"
This reverts commit 31904563bb.
The option in the UI might actually confuse users: For the time being
we'll just keep 1.0 as the namespace.

Change-Id: Ifc7b46227d57ec8d246c8f7818d5a619ef0cd3bd
Reviewed-on: http://codereview.qt.nokia.com/699
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-24 15:36:28 +02:00
Kai Koehne
31904563bb QtQuickApp wizard: Add option for QtQuick 1.1 module
Technically it's just one line in the generated file, but might
avoid people be confused on why there is only QtQuick 1.0 as an option.

Change-Id: I61fb4e82d8ee71fe6fddcd6845b4b48e78004e81
Reviewed-on: http://codereview.qt.nokia.com/625
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-23 14:36:52 +02:00
Kai Koehne
8ec524910a QtQuickApp wizard: Use qsTr() for string
Change-Id: Ie2f40065c000b5bf588a0cd5470ec42091080c97
Reviewed-on: http://codereview.qt.nokia.com/621
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-22 18:05:36 +02:00
Feetu Nyrhinen
2964f7a9fa Qt Quick Components Wizard
Selection of Qt Quick component set
and use of specific QML template files (Qt Quick 1.0 and
com.nokia.symbian 1.0) based on the user selections.

Change-Id: I93cfa8735dcf285c76ff04a6186a4eca1f90a361
Reviewed-on: http://codereview.qt.nokia.com/567
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-06-22 15:26:55 +02:00
Thorbjørn Lindeijer
2b0266d0ee Disable observer and jsdebugger services when they're already part of Qt
As of Qt 4.8 the observer and jsdebugger services are part of Qt. This
means the following changes are necessary in Qt Creator:

* Do not link to the QmlJSDebugger library.
* Do not create JSDebuggerAgent and QDeclarativeViewObserver instances
  in the QmlApplicationViewer and use the new declarative_debug CONFIG
  option to enable those services in Qt. This is done automatically
  for debug builds.
* Point out the QML Debugging Library and the QML Observer are "Not
  needed" in the Qt options page.
* Change the label in qmake options from "Link QML debugging library" to
  "Enable QML debugging". It still remains as a way to enable this
  functionality in release builds or for QtQuick applications not based
  on Qt Creator's template.
* Rely on qmlviewer for debugging QML UI projects rather than the
  observer, which is no longer necessary.

Reviewed-by: Kai Koehne
2011-05-12 15:56:05 +02:00
Alessandro Portale
3970f60814 Include touchnavigation.pri from main .pro file
And have that entry removed by the wizard. REMOVE_NEXT_LINE
is now the keyword for line removal. INCLUDE_DEPLOYMENT_PRI
was replaced by REMOVE_NEXT_LINE.
2011-04-17 09:55:17 +02:00
Christian Kandeler
11974a1449 Mobile wizards: Don't show orientation options for Harmattan & Meego. 2011-04-07 17:26:19 +02:00
Kai Koehne
304b3c881c QtQuickApp: Remove QMLJSDEBUGGER define from custom .pro file
The qmljsdebugger-lib.pri is only included in 2.2 if the user explicitly
selected it in the Project Settings.

Reviewed-by: Christiaan Janssen
2011-03-07 16:35:27 +01:00
Thorbjørn Lindeijer
3383a204cc Specify the right parent for the QDeclarativeViewObserver
This makes sure it gets deleted together with the QmlApplicationViewer,
rather than probably not at all when no parent is specified for the
viewer (which is the default).

Reviewed-by: Alessandro Portale
Reviewed-by: Christiaan Janssen
2011-02-22 16:38:20 +01:00
Kai Koehne
3fef120d59 QmlJSDebug: Move qmljsdebug into a static library
Reviewed-by: dt
2011-02-18 12:57:45 +01:00
Christian Kandeler
08aaad92ac Maemo: Fix default deployment paths.
Applications must live in /opt/<project name> on Harmattan & Meego.

Reviewed-by: Alessandro Portale
2011-02-08 18:09:06 +01:00
Alessandro Portale
6fc21c3416 More "qml[standalone]app" -> "qtquickapp" renaming 2011-02-07 12:47:07 +01:00