andrius
/
partitionmanager
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'master' into frameworks 

Conflicts:
	src/fs/btrfs.cpp
	src/plugins/dummy/dummybackend.cpp
	src/plugins/libparted/libpartedbackend.cpp
	src/util/helpers.cpp
This commit is contained in:
Andrius Štikonas 2014-07-02 14:21:47 +01:00
parent d56ee33cf1 1579790072
commit e469561b6f
6 changed files with 99 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/CMakeLists.txt
View File

@ -62,6 +62,7 @@ add_executable(partitionmanager ${partitionmanager_SRCS})
target_link_libraries(partitionmanager partitionmanagerprivate)
install(TARGETS partitionmanager ${INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/partitionmanager.appdata.xml DESTINATION share/appdata)
install(FILES gui/partitionmanagerui.rc DESTINATION ${DATA_INSTALL_DIR}/partitionmanager)
install(PROGRAMS partitionmanager.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})

2
src/fs/btrfs.cpp
View File

@ -128,7 +128,7 @@ namespace FS
bool btrfs::create(Report& report, const QString& deviceNode) const
{
ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), QStringList() << deviceNode);
ExternalCommand cmd(report, QStringLiteral("mkfs.btrfs"), QStringList() << QStringLiteral("-f") << deviceNode);
return cmd.run(-1) && cmd.exitCode() == 0;
}

94
src/partitionmanager.appdata.xml Normal file
View File

File diff suppressed because one or more lines are too long

2
src/plugins/dummy/dummybackend.cpp
View File

@ -48,7 +48,7 @@ static KAboutData createPluginAboutData()
KAboutLicense::GPL,
i18n("Copyright 2010 Volker Lanz"));
about.addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Maintainer"), QStringLiteral("vl@fidra.de"));
about.addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Former maintainer"));
about.setHomepage(QStringLiteral("http://www.partitionmanager.org"));
return about;

2
src/plugins/libparted/libpartedbackend.cpp
View File

@ -70,7 +70,7 @@ static KAboutData createPluginAboutData()
KAboutLicense::GPL,
i18n("Copyright 2008,2009,2010 Volker Lanz"));
about.addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Maintainer"), QStringLiteral("vl@fidra.de"));
about.addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Former maintainer"));
about.setHomepage(QStringLiteral("http://www.partitionmanager.org"));
return about;

2
src/util/helpers.cpp
View File

@ -123,7 +123,7 @@ KAboutData* createPartitionManagerAboutData()
about->setProgramIconName(QStringLiteral("partitionmanager"));
about->setProductName(QByteArray("partitionmanager"));
about->addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Maintainer"), QStringLiteral("vl@fidra.de"));
about->addAuthor(i18nc("@info:credit", "Volker Lanz"), i18nc("@info:credit", "Former maintainer"));
about->addAuthor(i18nc("@info:credit", "Andrius Štikonas"), i18nc("@info:credit", "Developer"), QStringLiteral("andrius@stikonas.eu"));
about->setHomepage(QStringLiteral("http://www.partitionmanager.org"));