Commit Graph

248 Commits

Author SHA1 Message Date
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Thomas Hartmann
17a7bd17d0 Wizards: allows filtering of wizards based on Qt version
Every wizard now implements requiredFeatures() to define a feature set.
If the feature set is not satisfied by the available Qt Versions,
the wizard is not shown in the create file/project dialog.

Every Qt version can define the provided feature set in availableFeatures()
defined in BaseQtVersion.

Change-Id: Ie9e2c210d19187b2296451948c36d274f2096623
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-01-18 15:13:52 +01:00
Eike Ziller
61082af6af Doc: Location where "local" data is saved (e.g. compiled helpers).
Change-Id: I21ccfd58cbcaae6231b88d3a9039eb413f4be1c2
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-01-13 13:07:53 +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
d30196daf3 Merge remote-tracking branch 'origin/2.4'
Conflicts:
	src/libs/qmljs/qmljsinterpreter.cpp
	src/libs/utils/ssh/sshconnection.cpp
	src/plugins/madde/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qmakestep.cpp

Change-Id: Id0c9185638038f7506bc9507872d6699345414a9
2011-12-07 13:24:45 +01:00
Christian Kandeler
0a59f34794 Harmattan: Introduce new condition for auto-generation of manifest file.
In addition to using an empty file as in 2.3, the user can now also put
a magic string at the start of the manifest file. This way, we can use
this as the default while also documenting it in-place.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I375a73a5d2e9d3e0973d97d81e0110e788d0159a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-12-05 16:34:54 +01:00
Eike Ziller
d0c0c0628d Start on Creating Plugins documentation.
Change-Id: Ic75775473cfb405cee5c53b2dc24144dba51a25c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-28 14:52:04 +01:00
Eike Ziller
faeb6b31be The pri files already put the plugin spec into OTHER_FILES
Change-Id: I08bc60c72f8a37043ba9fb7bb2e9bd9b3dad9039
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-24 07:56:10 +01:00
hjk
46eb49eafd projectmanager: re-organize New Project categories
Change-Id: Ie549f9843db985018af380eb6105e136f21989f7
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-18 17:50:06 +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
hjk
d625c9df73 Re-arrange CMake project template.
Change-Id: I9351e183fe7419de2e02d65cc1b9668e463da195
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-17 13:28:12 +01:00
Yuchen Deng
75c7b5f7fd Add plain C/C++ project for CMake
Change-Id: Id9f0982092be182b976a566d0ae5eddd11307db1
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-17 13:25:26 +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
b58a7aef17 QtQuick/Html apps: Fix some non-shadowbuild cases
If the .target of a .source/.target tuple is empty, we get a "//"
in the path. Let's replace it with a "/" before string-comparing
it to another path.

If the .target is just a "." like in the HTML template code, we get
to replace a "/./" with a "/".

Change-Id: I5b6fef93c3efd5a21f9461b6e85c76f13bfb75e1
Task-Id: QTBUG-21060
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-11-04 20:08:31 +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
Robert Loehning
86f8f2be2e String fixes in New Project wizard
Task-number: QTCREATORBUG-6456

Change-Id: I37cf5c8f8a91d015e6aada803ab7158a77c33e40
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2011-11-03 15:14:59 +01:00
Robert Loehning
7ec73a3e16 String fixes
Change-Id: Iffa87a0e394b799e3987fa60f0a7559d5c1d0d27
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-03 10:36:46 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
hjk
29279ab8c7 more style fixes of string literal access
Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096
Reviewed-by: hjk <qthjk@ovi.com>
2011-11-02 18:20:19 +01:00
Christian Kandeler
5c6e760d0b Harmattan: Support "no Aegis manifest file" case.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=284797
Change-Id: I66aa22140362141c36070ab971d2283f60bcb49d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-10-13 17:46:25 +02:00
Eike Ziller
ae3a833b8c Commit things that went missing from 2a4a56b2be
Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-06 09:52:22 +02:00
Eike Ziller
2a4a56b2be Load plugins from user config directory too.
Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-10-05 18:32:10 +02:00
Christian Kamm
5ce24ce06a Qml plugin wizard: Add uri annotation.
Change-Id: Ie207fe674ac92b5cbcace054f452dec5300e1222
Reviewed-on: http://codereview.qt-project.org/5833
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-10-04 10:32:29 +02:00
hjk
70aa191b34 plain c++ app wizard: change name from 'qmake console'
Change-Id: I1e3b094c70d8f887d3cd451c961ae067b4423289
Reviewed-on: http://codereview.qt-project.org/5467
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-29 16:42:39 +02:00
hjk
10d3d00c76 a simple 'new project' wizard for a plain C project
Change-Id: Ie3102362af67858790ff3121d2db56a7183906d4
Reviewed-on: http://codereview.qt-project.org/5468
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-09-27 16:19:21 +02:00
Friedemann Kleint
580f834a5d tr()-Fixes for 2.4
Change-Id: I151e75ebec7bff17a3779f1b367849ca514512c6
Reviewed-on: http://codereview.qt-project.org/5550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-09-26 16:54:45 +02:00
hjk
56a05bf287 replace 'QMake Console' with 'Plain C++'
Change-Id: I26b29ce0e62e6470629117ff21412a4cfbe74488
Reviewed-on: http://codereview.qt-project.org/5306
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 12:05:18 +02:00
hjk
13418a2086 fix string in 'qmake console' wizard
Change-Id: I0cf1b405b9df2af681c87f1636d3457afba0d86e
Reviewed-on: http://codereview.qt-project.org/5305
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 11:57:05 +02:00
Yuchen Deng
cc4e2a445c Creates a pure console project using QMake, not using Qt library.
Merge-request: 386
Reviewed-by: hjk <qtc-committer@nokia.com>

Change-Id: I1292faa757d7974eb35c1d463d75bc53f8044c41
Reviewed-on: http://codereview.qt-project.org/5304
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-21 11:56:56 +02: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
0702e8a3b5 MobileWizards: Rename MaemoPngIcon to just PngIcon
Change-Id: I3aa1f0eb3d2a894ba816c0d055d847a21f71da27
Reviewed-on: http://codereview.qt.nokia.com/3110
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2011-08-26 12:47:22 +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
Kai Koehne
a09851e479 QmlExtension wizard: Use $$[QT_INSTALL_IMPORTS] for desktop targets
Change-Id: I1d3dc0c148a5f05d81f6cc0d22c3b13c504a1edb
Reviewed-on: http://codereview.qt.nokia.com/1875
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-20 13:15:57 +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
Christian Kandeler
75a86a7951 MeeGo: Make use of new qmake flags.
Change-Id: I0cbb934e2c49c7c99b6fff0b8f92e5802471ef8c
Reviewed-on: http://codereview.qt.nokia.com/1326
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2011-07-08 14:30:40 +02:00
hjk
a322bd606f Replace qt-info@nokia.com with info@qt.nokia.com
Change-Id: I61e7cf189a1c4ea04e2a88a80a4f15e43cd3c018
Reviewed-on: http://codereview.qt.nokia.com/1187
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-07-06 11:14:01 +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