Commit Graph

81 Commits

Author SHA1 Message Date
Christian Kandeler
93304df038 Always pass Core::Id by value.
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-01 11:52:08 +02: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
Tobias Hunger
f5224a6db6 Task: Add a new Task category for deployment issues
These are not build system issues and deserve their own category.

This has the side effect of avoiding them to get cleared when e.g.
reparsing Qbs files.

Change-Id: Ib949504533f7f15a560796bea91cae329f19a20b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-20 12:19:42 +02:00
Friedemann Kleint
ebfb3bbca7 Clean headers in RemoteLinux.
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: Ie7559562218ecab65da17f58e3515556a4a1d5c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-04-04 09:10:40 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Daniel Teske
66bff3f1f1 RemoteLinuxDeployService: Remove superfluous dependency on bc
Change-Id: I214bf081192c4071d4082623792f7a12a9de61c8
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-01-15 15:47:48 +01: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 Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
hjk
b906360a34 madde/qnx/remotelinux: adjust after profile changes
More Profile use, less dependency on QtSupport,
Derive qtVersionId from profile instead of qt build configuration.
Replace qt4BuildConfiguration with buildConfiguration.
Use IDevice base class in AbstractRemoteLinuxApplicationRunner
and in other places.  Simplify remote linux runconfiguration

Change-Id: I6414d3d8146d16c360b3a0465c57a052ea71f899
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-07-26 12:50:06 +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
Montel Laurent
d83fda1c38 remote linux: fix mem leak
Change-Id: I0b421ae53f7651baa2d7c804379c012c6b78201f
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-07-16 12:37:04 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Tobias Hunger
df5dab6382 Use Core::Id in project-related objects
Use Core::Id for all the project related objects in favor of plain
QStrings.

Change-Id: I790ab40cb29899efdb49c413a77609486f52e683
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-04-25 11:49:19 +02:00
Tobias Hunger
97496df1bf Task: Update Task to use Utils::FileName and Core::Id
Use Utils::FileName and Core::Id in Task structure.

Change-Id: Ia0ed459f86df36ffe547abde7c240b0ac409bcf5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 11:34:43 +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
Christian Kandeler
b2b48bda89 RemoteLinux: Fix error message.
It's a pre-deployment check.

Change-Id: If110cf6bce00ea8c159c3ec60ccb19f8d6c0a997
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-01-24 15:41:45 +01:00
Nikolai Kosjar
f75abb341e Deploy steps: Introduce SimpleBuildStepConfigWidget.
This simplifies some deploy steps and replaces
RemoteLinuxDeployStepWidget.

Change-Id: I4ad82c498cee0f15e1c93bf915cd48355017eb84
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Paweł Polański <pawel.3.polanski@nokia.com>
2012-01-11 16:02:19 +01:00
Christian Kandeler
60830e000b RemoteLinux: Rename and unconstify deploy step function.
The name "isDeploymentPossible" was misleading, as was the const
modifier.

Change-Id: Iccaa307133f56ab02a8d6054b0ca9bf660e0d30d
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-11-23 13:14:12 +01:00
Christian Kandeler
5211256549 RemoteLinux: Don't make presence of device an absolute prerequisite ...
... for deployment and running.
Rationale: An emulator might get started on-demand during deployment
and get auto-detected in the process.

Change-Id: Id95ccccbf4d570f9fa69a6ed3a8a473fd63c5968
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-11-22 18:22:23 +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
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
Daniel Teske
3cc1a2a914 Less magic in BuildStep::buildConfiguration() and deployConfiguration()
Where the deploy stuff depends on the activeBuildConfiguration it's
likely to be wrong or worse could be used to crash creator. So make
those places stand out.
Also if we ever move towards supporting meta-builds of multiple
buildconfigurations at once, then using the active build configuration
is wrong.

Change-Id: I754a77a4a8b352e79e8a6703c26ed41a189cf74e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2011-10-24 12:08:04 +02:00
Christian Kandeler
7fa56b08cf RemoteLinux: Make missing target path non-fatal.
There might be e.g. subprojects in a SUBDIRS project that are not
supposed to be deployed. Let's support this without forcing people to
use CONFIG variables, but emit a big fat warning.

Change-Id: I17c9337cecbf68c632ce925fa9a53655dcfaba64
Reviewed-on: http://codereview.qt-project.org/5801
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-29 15:13:41 +02:00
Christian Kandeler
76176a8336 RemoteLinux: Deployment improvements.
- Don't depend on the order of signal connections when updating the
deploy step label.
- Give a meaningful error message when the init() function fails.
- Don't try to upload files that don't have a target path set.

Change-Id: If302cf8407b69faf8507579267afde7428edf704
Reviewed-on: http://codereview.qt-project.org/5404
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-22 17:39:06 +02:00
hjk
1285a63852 d-ptr style
Change-Id: I9bae06c72d71d77b4a43f87217b7c3f8077a1fd1
Reviewed-on: http://codereview.qt-project.org/5075
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-16 11:35:08 +02:00
Christian Kandeler
aa5f2928a4 RemoteLinux: Change output at the end of a deploy step.
"Deployment finished" is potentially misleading, as other steps
might follow.

Change-Id: I457b2c2427c65146b48e13bf9323ac11feee18db
Reviewed-on: http://codereview.qt-project.org/4561
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-09-09 17:09:47 +02:00
Christian Kandeler
9d5f420f4d RemoteLinux: Rename a bunch of classes.
They still had "Maemo" in their names, even though
they are not Maemo-specific (and will not move
to the respective plugin).

Change-Id: I5eec0de27db8340f2a987a6ed685b3ae46ec17b0
Reviewed-on: http://codereview.qt.nokia.com/2036
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-22 14:39:46 +02:00
Christian Kandeler
076064ce30 RemoteLinux: Introduce abstract packaging step.
This removes the dependency of the tar packaging step on Maemo-specific code.

Change-Id: I863b13e643a5028edaf2f571f63b1a52d229812b
Reviewed-on: http://codereview.qt.nokia.com/1709
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-15 17:06:29 +02:00
Christian Kandeler
2bdc5c79c6 RemoteLinux: Separate generic and MADDE-specific deploy configurations.
Change-Id: If06ee9fbf91a50bcb6c7b79a824f3f74f92b98d2
Reviewed-on: http://codereview.qt.nokia.com/1671
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2011-07-14 15:47:35 +02:00
Christian Kandeler
c986374f32 RemoteLinux: Separate generic deploy steps from Maemo-specific ones.
Change-Id: I804e3778114ba09b9d47fd113eb2a56f4233f3e2
Reviewed-on: http://codereview.qt.nokia.com/1048
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2011-07-13 11:19:38 +02:00