zbenjamin has proposed merging lp:~zeller-benjamin/kubuntu-packaging/qtcreator-qmakeprojectpatch into lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
Commit message: Add new patch to make the qmakeprojectmanager aware of our needs in the Ubuntu SDK Requested reviews: Zoltan Balogh (bzoltan) For more details, see: https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator-qmakeprojectpatch/+merge/240827 Add new patch to make the qmakeprojectmanager aware of our needs in the Ubuntu SDK -- https://code.launchpad.net/~zeller-benjamin/kubuntu-packaging/qtcreator-qmakeprojectpatch/+merge/240827 Your team Kubuntu Packagers is subscribed to branch lp:~kubuntu-packagers/kubuntu-packaging/qtcreator.
=== added file 'debian/patches/qmakeproject_ubuntusdk.patch' --- debian/patches/qmakeproject_ubuntusdk.patch 1970-01-01 00:00:00 +0000 +++ debian/patches/qmakeproject_ubuntusdk.patch 2014-11-06 09:28:22 +0000 @@ -0,0 +1,30 @@ +Description: Enable the qmakeprojectmanager plugin to support the +needs of the Ubuntu SDK: + * Read UBUNTU_MANIFEST_PATH from projectfiles. + +Author: Benjamin Zeller <[email protected]> +Reviewed-By: +Last-Update: <2014-11-06> + +--- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp ++++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp +@@ -2075,6 +2075,7 @@ + newVarValues[AndroidDeploySettingsFile] = m_readerExact->values(QLatin1String("ANDROID_DEPLOYMENT_SETTINGS_FILE")); + newVarValues[AndroidPackageSourceDir] = m_readerExact->values(QLatin1String("ANDROID_PACKAGE_SOURCE_DIR")); + newVarValues[AndroidExtraLibs] = m_readerExact->values(QLatin1String("ANDROID_EXTRA_LIBS")); ++ newVarValues[UbuntuManifestFile] = m_readerExact->values(QLatin1String("UBUNTU_MANIFEST_FILE")); + + m_isDeployable = false; + if (m_projectType == ApplicationTemplate) { +--- a/src/plugins/qmakeprojectmanager/qmakenodes.h ++++ b/src/plugins/qmakeprojectmanager/qmakenodes.h +@@ -107,7 +107,8 @@ + AndroidArchVar, + AndroidDeploySettingsFile, + AndroidPackageSourceDir, +- AndroidExtraLibs ++ AndroidExtraLibs, ++ UbuntuManifestFile + }; + + // Import base classes into namespace
-- kubuntu-devel mailing list [email protected] Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/kubuntu-devel
