zbenjamin has proposed merging lp:~zeller-benjamin/kubuntu-packaging/qtcreator-ubuntudevice-qmlprojects2 into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
Commit message: Fix qmlproject patch to match all ubuntudevice subtypes Requested reviews: Zoltan Balogh (bzoltan) For more details, see: https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator-ubuntudevice-qmlprojects2/+merge/229237 Fix qmlproject patch to match all ubuntudevice subtypes -- https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator-ubuntudevice-qmlprojects2/+merge/229237 Your team Kubuntu Packagers is subscribed to branch lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== modified file 'debian/changelog' --- debian/changelog 2014-07-29 15:46:11 +0000 +++ debian/changelog 2014-08-01 14:03:02 +0000 @@ -1,3 +1,9 @@ +qtcreator (3.1.1-0ubuntu4) utopic; urgency=medium + + * Change patch to enable ubuntu device in plain QML projects, to match all Ubuntu device subtypes + + -- Benjamin Zeller <[email protected]> Fri, 01 Aug 2014 13:55:35 +0200 + qtcreator (3.1.1-0ubuntu3) utopic; urgency=medium * Add patch to enable ubuntu devices for plain QML projects in QtCreator === modified file 'debian/patches/qmlproject_allow_ubuntudevice.diff' --- debian/patches/qmlproject_allow_ubuntudevice.diff 2014-07-29 11:32:57 +0000 +++ debian/patches/qmlproject_allow_ubuntudevice.diff 2014-08-01 14:03:02 +0000 @@ -16,7 +16,7 @@ Id deviceType = ProjectExplorer::DeviceTypeKitInformation::deviceTypeId(k); - if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE) { + if (deviceType != ProjectExplorer::Constants::DESKTOP_DEVICE_TYPE && -+ deviceType != "UbuntuProjectManager.DeviceTypeId") { ++ !deviceType.toString().startsWith(QStringLiteral("UbuntuProjectManager.DeviceTypeId"))) { if (errorMessage) *errorMessage = tr("Device type is not desktop."); return false;
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
