Commit Graph

288 Commits

Author SHA1 Message Date
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
mfekari
8b29f4439a Qnx: Update the wizard templates for Qt5 applications on BlackBerry
Change-Id: I4b17c59b1e25fd453d2fe09fb865832291ffc87c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-19 11:15:43 +02:00
Eike Ziller
9bbafdb506 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/share.qbs

Change-Id: I2ab6080a8cc5315191b33c6df21a835df888a291
2012-10-18 13:39:47 +02:00
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
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
2012-10-16 17:42:10 +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
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
2012-10-11 21:11:40 +02:00
Kevin Krammer
af4b4e9008 QNX: remove unnecessary lines from project template files
the "-platform blackberry" command line argument is no longer
required in bar-descriptor.xml files due to Qt being built with
QT_QPA_DEFAULT_PLATFORM_NAME defined "blackberry", thus making that
the QPA loader's default choice.

See mkspecs/blackberry-armv7le-qcc/qplatformdefs.h and
mkspecs/blackberry-x86-qcc/qplatformdefs.h

Change-Id: I35fdaf71adf0bb1b9041da90db857a7074b12cff
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-10-09 16:40:12 +02:00
Eike Ziller
d5d1c5e394 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/genericdirectuploadservice.cpp
	src/tools/qtcreatorcrashhandler/main.cpp

Change-Id: I830287691e7085fe9c94597e23ec7be64eb8be42
2012-10-09 11:50:17 +02:00
Eike Ziller
2b56943a8e Change the default plugin provider to QtProject.
Change-Id: I4fbfeb3668d6688e4947cda514c1a56f7d01ca52
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:39:40 +02:00
Eike Ziller
4f0b90dd43 Fix remaining URLs and a few other things that still referred Nokia
Change-Id: I1c85bae3a1ada7a281fedd6951b35e6a4da395e6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-09 11:10:50 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
2012-10-05 20:51:31 +02:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Tobias Nätterlund
26ef19061c QNX: Fixup bar-descriptor.xml files
- Qt 4 is included on the device for the BB10, add its path to LD_LIBRARY_PATH and QT_PLUGIN_PATH
- Make application ID depend on project name

Change-Id: I2dc67c0415395cb0a2c64fec1f1c43a96a3dde2c
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 09:55:06 +02:00
Friedemann Kleint
f02c0f64e2 Add a wizard that lets the user enter a code-snippet.
This is useful when fixing tasks that contain a code snippet.

Change-Id: Idaf523839254eed97a363501f0aba4317d216d1c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 14:33:37 +02:00
Tobias Nätterlund
f8954ab962 QNX: Fixed compilation for BlackBerry QtQuick2 template
Change-Id: I5c15c6c6ac69dbf46f676d4f330ed75a2f923c85
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
2012-09-05 07:34:52 +02:00
Alessandro Portale
8d6566b68b QtQuick 2 Application Wizard
This patch adds a new variant of the good old ugly
QmlApplicationViewer wizard. The new one is QQuickView based,
and thus targets QtQuick2

Change-Id: I049223f644029e75bd15120b003c0ce4907a547a
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-09-04 20:32:33 +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
Robert Loehning
ed7c80d4c6 Normalized connect()s
Change-Id: Ieb95bd04026d4a8ba824e6355031954332654e99
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-26 16:12:43 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Eike Ziller
5e3998dd16 Make Plain C/C++ wizard more consistent over platforms.
Since it creates a console app also create a bundle-less app on Mac.

Task-number: QTCREATORBUG-7304
Change-Id: I00749f0d8a4c02bd80d4e7468b3abea552db23dc
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-07-17 12:54:02 +02:00
Tobias Nätterlund
a7ac2bb559 New QNX plugin.
This plugin adds support for cross-compiling, deploying, running
and debugging on a PlayBook or QNX Neutrino device.

Change-Id: I0da7ccee40bd7ce4c0d6bdc6884d48ef23167dac
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-13 15:37:34 +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
Joerg Bornemann
b1888c76ba adjust deployment.pri to DEPLOYMENT variable changes in Qt 5
X.sources has been deprecated in Qt 4.8.0 and removed in Qt 5.

Change-Id: I3d5228bd6db6d3eaccd76fc49e9b934263f9922c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-07-03 11:35:06 +02:00
Eike Ziller
3934347fe9 ActionManager API cleanup.
d-pointer instead of inheritance
static methods

Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-25 10:08:24 +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
Alessandro Portale
902358b600 Fix of a spelling error in the Html5 template code
Change-Id: Id0b0186b66254e275cb1648e57055ab44530a64a
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-04-19 17:34:28 +02:00
hjk
87fcf7ebea use include order from most-specific to least-specific in template
Change-Id: I989afb986f469ee7223eb84b7db6805d9fe00dd6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-04-17 10:59:53 +02:00
Alessandro Portale
f34e0bbfdf Html5 app wizard: Adapt to QUrl changes in Qt 4.8.0
These changed have been reverted in Qt 4.8.1 (and 4.8.0 for Symbian).

Task-number: QTCREATORBUG-6883

Change-Id: I66e30fe242ffab56f9966a37a152ec2d5c863847
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-03-14 14:53:42 +01:00
hjk
272e203b36 wizard: move plain C/C++ app to "Non-Qt project" category
Change-Id: I89f4c37d7b88cbe5d9fdeff7536d00f68c8035ec
Reviewed-by: hjk <qthjk@ovi.com>
2012-03-07 15:36:58 +01:00
Robert Loehning
b41171c847 Normalized connect()s
Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-03-06 12:46:52 +01: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
Christian Kandeler
b1b431f21f Harmattan: Fix aegis template.
Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=298677
Change-Id: Iaf8206874bac34e959aad62011e331cef5904b37
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-22 14:05:24 +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
Thomas Hartmann
cc76f6eadd Wizards: removing feature GENERIC_CPP_ENTRY_POINT
We want finer grained features

Change-Id: Id65d58409a6960aa9d132cb29592b921ee6bcfdf
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-02-14 13:58:02 +01:00
Thomas Hartmann
95a028e835 Wizards: changes the structure of Wizards
This patch introduces platforms as a top level topic when choosing
a wizard. Also I changed the categories and priorities.

Details:

1. I did change the way the dialog/view is structured in newdialog.cpp

2. I added platformName() and supportsPlatform() to BaseQtVersion.
   I needed two functions because the Simulator does not provide a platform
   and therefore has no platformName but supports two platforms.
   I still have to turn the platform names into proper constants.

3. I changed the categories and priorities to get the layout that was
   discussed. (I had to touch quite alot of files but this is mostly trivial)

4. I added a combobox that allows filtering for platforms.

5. I added flags() to IWizard to indicate that a wizard is platform independent.

Change-Id: I86c7ad628a431ad06505c76580885c6e6c3ddc23
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 17:42:27 +01:00
Thomas Hartmann
ea23486847 Wizards: adding requirement for Qt Quick 1.0 to extension wizard
The Qml extension wizard requires Qt Quick 1.0

Change-Id: I53bc157fc270fa8f2d2b296eb5c90edb86f57972
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-02-08 16:30:33 +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
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