Commit 2cb4181e authored by Martin Koller's avatar Martin Koller

Further KF5 porting

parent 47e5c376
......@@ -9,20 +9,16 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
add_definitions(-DTRANSLATION_DOMAIN="cervisia")
include(KDEInstallDirs)
include(KDECompilerSettings)
include(KDECMakeSettings)
include(KDECompilerSettings)
include(ECMInstallIcons)
include(FeatureSummary)
include(ECMAddAppIcon)
include(ECMMarkNonGuiExecutable)
include(FeatureSummary)
find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Widgets DBus)
find_package(KF5 REQUIRED COMPONENTS Parts DocTools Init)
include_directories(
${CMAKE_SOURCE_DIR}
${CMAKE_BINARY_DIR}
)
find_package(KF5 REQUIRED COMPONENTS Parts DocTools Init IconThemes Notifications WidgetsAddons Su)
add_subdirectory( doc )
add_subdirectory( cvsservice )
......@@ -31,7 +27,7 @@ add_subdirectory( pics )
set(_KDECONFDIR_ ${CONFIG_INSTALL_DIR})
set(_KDEHTMLDIR_ ${HTML_INSTALL_DIR})
configure_file (cervisia.1.cmake ${CMAKE_CURRENT_BINARY_DIR}/cervisia.1 @ONLY)
configure_file(cervisia.1.cmake ${CMAKE_CURRENT_BINARY_DIR}/cervisia.1 @ONLY)
########### next target ###############
......@@ -121,7 +117,7 @@ qt5_add_dbus_adaptor(cervisiapart_PART_SRCS org.kde.cervisia.protocolview.xml pr
add_library(cervisiapart MODULE ${cervisiapart_PART_SRCS})
target_link_libraries(cervisiapart KF5::Parts)
target_link_libraries(cervisiapart KF5::Parts KF5::Notifications)
install(TARGETS cervisiapart DESTINATION ${PLUGIN_INSTALL_DIR} )
......
......@@ -24,7 +24,7 @@ using namespace Cervisia;
#include <QMenu>
#include <QTextStream>
#include <KLocale>
#include <KLocalizedString>
#include <KMessageBox>
......
......@@ -25,14 +25,14 @@
#include <QFileInfo>
#include <QLabel>
#include <QStringList>
// KDE
#include <KListWidget>
#include <KLocale>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QVBoxLayout>
#include <QListWidget>
// KDE
#include <KLocalizedString>
#include <KConfigGroup>
AddRemoveDialog::AddRemoveDialog(ActionType action, QWidget* parent)
......@@ -43,17 +43,13 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, QWidget* parent)
i18n("CVS Remove") );
setModal(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
//PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
mainLayout->addWidget(buttonBox);
okButton->setDefault(true);
// Also give the focus to the OK button, otherwise the Help button gets focus
// and is activated by Key_Return
......@@ -63,8 +59,6 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, QWidget* parent)
mainLayout->addWidget(mainWidget);
QBoxLayout *layout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(layout);
layout->setSpacing(spacingHint());
layout->setMargin(0);
QLabel *textlabel = new QLabel
......@@ -74,7 +68,7 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, QWidget* parent)
mainWidget );
layout->addWidget(textlabel);
m_listBox = new KListWidget(mainWidget);
m_listBox = new QListWidget(mainWidget);
mainLayout->addWidget(m_listBox);
m_listBox->setSelectionMode(QAbstractItemView::NoSelection);
layout->addWidget(m_listBox, 5);
......@@ -98,10 +92,14 @@ AddRemoveDialog::AddRemoveDialog(ActionType action, QWidget* parent)
layout->addSpacing(5);
}
/*
if( action == Remove )
setHelp("removingfiles");
else
setHelp("addingfiles");
*/
mainLayout->addWidget(buttonBox);
}
......
......@@ -23,7 +23,7 @@
#include <QDialog>
class KListWidget;
class QListWidget;
class QStringList;
class AddRemoveDialog : public QDialog
......@@ -36,7 +36,7 @@ public:
void setFileList(const QStringList& files);
private:
KListWidget* m_listBox;
QListWidget* m_listBox;
};
#endif // ADDREMOVEDIALOG_H
......
......@@ -22,21 +22,18 @@
#include "addrepositorydialog.h"
#include <qcheckbox.h>
#include <khbox.h>
#include <qlabel.h>
#include <qlayout.h>
//Added by qt3to4:
#include <QLabel>
#include <QVBoxLayout>
#include <QBoxLayout>
#include <kconfig.h>
#include <QLineEdit>
#include <klocale.h>
#include <knuminput.h>
#include <kconfiggroup.h>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QSpinBox>
#include <KConfig>
#include <KConfigGroup>
#include <KLocalizedString>
AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const QString& repo,
......@@ -47,25 +44,19 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const QString& repo,
setWindowTitle(i18n("Add Repository"));
setModal(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
//PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
mainLayout->addWidget(buttonBox);
okButton->setDefault(true);
QFrame* mainWidget = new QFrame(this);
mainLayout->addWidget(mainWidget);
QBoxLayout* layout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(layout);
layout->setSpacing(spacingHint());
layout->setMargin(0);
QLabel* repo_label = new QLabel(i18n("&Repository:"), mainWidget);
......@@ -101,19 +92,22 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const QString& repo,
server_label->setBuddy(server_edit);
layout->addWidget(server_edit);
KHBox* compressionBox = new KHBox(mainWidget);
mainLayout->addWidget(compressionBox);
m_useDifferentCompression = new QCheckBox(i18n("Use different &compression level:"), compressionBox);
QHBoxLayout* compressionBox = new QHBoxLayout;
mainLayout->addLayout(compressionBox);
m_useDifferentCompression = new QCheckBox(i18n("Use different &compression level:"));
m_compressionLevel = new QSpinBox();
m_compressionLevel->setRange(0, 9);
m_compressionLevel = new KIntNumInput(compressionBox);
m_compressionLevel->setRange(0, 9, 1);
m_compressionLevel->setSliderEnabled(false);
layout->addWidget(compressionBox);
compressionBox->addWidget(m_useDifferentCompression);
compressionBox->addWidget(m_compressionLevel);
m_retrieveCvsignoreFile = new QCheckBox(i18n("Download cvsignore file from "
"server"), mainWidget);
layout->addWidget(m_retrieveCvsignoreFile);
mainLayout->addWidget(buttonBox);
connect( repo_edit, SIGNAL(textChanged(QString)),
this, SLOT(repoChanged()) );
connect( m_useDifferentCompression, SIGNAL(toggled(bool)),
......@@ -121,14 +115,14 @@ AddRepositoryDialog::AddRepositoryDialog(KConfig& cfg, const QString& repo,
repoChanged();
KConfigGroup cg(&partConfig, "AddRepositoryDialog");
restoreDialogSize(cg);
restoreGeometry(cg.readEntry<QByteArray>("geometry", QByteArray()));
}
AddRepositoryDialog::~AddRepositoryDialog()
{
KConfigGroup cg(&partConfig, "AddRepositoryDialog");
saveDialogSize(cg);
cg.writeEntry("geometry", saveGeometry());
}
......
......@@ -25,7 +25,7 @@
class QCheckBox;
class KConfig;
class KIntNumInput;
class QSpinBox;
class QLineEdit;
class AddRepositoryDialog : public QDialog
......@@ -58,7 +58,7 @@ private:
QLineEdit* server_edit;
QCheckBox* m_useDifferentCompression;
QCheckBox* m_retrieveCvsignoreFile;
KIntNumInput* m_compressionLevel;
QSpinBox* m_compressionLevel;
KConfig& partConfig;
};
......
This diff is collapsed.
......@@ -95,8 +95,7 @@ void CervisiaShell::setupActions()
action->setToolTip( hint );
action->setWhatsThis( hint );
action = KStandardAction::keyBindings( this, SLOT(slotConfigureKeys()),
actionCollection() );
action = KStandardAction::keyBindings( this, SLOT(slotConfigureKeys()), actionCollection() );
hint = i18n("Allows you to customize the keybindings");
action->setToolTip( hint );
action->setWhatsThis( hint );
......@@ -107,7 +106,7 @@ void CervisiaShell::setupActions()
action->setWhatsThis( hint );
setHelpMenuEnabled(false);
(void) new KHelpMenu(this, componentData(), false);
(void) new KHelpMenu(this, KAboutData::applicationData(), false);
action = actionCollection()->action("help_contents");
hint = i18n("Invokes the KDE help system with the Cervisia documentation");
......
......@@ -31,17 +31,16 @@
#include <QLabel>
#include <QPushButton>
#include <QVBoxLayout>
#include <QLineEdit>
#include <QDialogButtonBox>
#include <QFileDialog>
// KDE
#include <kfiledialog.h>
#include <QLineEdit>
#include <klocale.h>
#include <kmessagebox.h>
#include <kurlcompletion.h>
#include <kconfiggroup.h>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QFileDialog>
#include <KLocalizedString>
#include <KLineEdit>
#include "progressdialog.h"
#include "repositories.h"
......@@ -62,25 +61,19 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceI
setWindowTitle( (action==Checkout)? i18n("CVS Checkout") : i18n("CVS Import") );
setModal(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
//PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
mainLayout->addWidget(buttonBox);
okButton->setDefault(true);
QFrame* mainWidget = new QFrame(this);
mainLayout->addWidget(mainWidget);
QBoxLayout* layout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(layout);
layout->setSpacing(spacingHint());
layout->setMargin(0);
QGridLayout* grid = new QGridLayout();
......@@ -161,7 +154,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceI
grid->addWidget(recursive_box, 6, 0, 1, 2);
}
workdir_edit = new QLineEdit(mainWidget);
workdir_edit = new KLineEdit(mainWidget);
mainLayout->addWidget(workdir_edit);
workdir_edit->setText(QDir::homePath());
workdir_edit->setMinimumWidth(fontMetrics().width('X') * 40);
......@@ -250,6 +243,8 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceI
grid->addWidget(export_box, 5, 0, 1, 2);
}
mainLayout->addWidget(buttonBox);
QStringList list1 = Repositories::readCvsPassFile();
QStringList::ConstIterator it1;
for (it1 = list1.constBegin(); it1 != list1.constEnd(); ++it1)
......@@ -261,7 +256,7 @@ CheckoutDialog::CheckoutDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceI
if (!list1.contains(*it2))
repo_combo->addItem(*it2);
setHelp((act == Import) ? "importing" : "checkingout");
//setHelp((act == Import) ? "importing" : "checkingout");
restoreUserInput();
connect(okButton,SIGNAL(clicked()),this,SLOT(slotOk()));
......@@ -508,7 +503,7 @@ void CheckoutDialog::saveUserInput()
CervisiaSettings::setModule(module());
CervisiaSettings::setWorkingFolder(workingDirectory());
CervisiaSettings::self()->writeConfig();
CervisiaSettings::self()->save();
if (act == Import)
{
......
......@@ -25,6 +25,7 @@
class QCheckBox;
class KComboBox;
class KConfig;
class KLineEdit;
class QLineEdit;
class OrgKdeCervisiaCvsserviceCvsserviceInterface;
......@@ -66,8 +67,8 @@ private:
void restoreUserInput();
KComboBox *repo_combo, *module_combo, *branchCombo;
QLineEdit *module_edit, *workdir_edit;
QLineEdit *comment_edit;
KLineEdit *workdir_edit;
QLineEdit *module_edit, *comment_edit;
QLineEdit *vendortag_edit, *releasetag_edit, *ignore_edit, *alias_edit;
QCheckBox *binary_box, *export_box, *recursive_box;
QCheckBox* m_useModificationTimeBox;
......
......@@ -22,21 +22,20 @@
#include <QBoxLayout>
#include <QCheckBox>
#include <KComboBox>
#include <QComboBox>
#include <QDir>
#include <QFileInfo>
#include <QLabel>
#include <QTextStream>
#include <QVBoxLayout>
#include <kconfig.h>
#include <klistwidget.h>
#include <klocale.h>
#include <kconfiggroup.h>
#include <KConfigGroup>
#include <QListWidget>
#include <QDialogButtonBox>
#include <QPushButton>
#include <KConfig>
#include <KConfigGroup>
#include <KGuiItem>
#include <KLocalizedString>
#include "cvsserviceinterface.h"
#include "logmessageedit.h"
......@@ -68,35 +67,29 @@ CommitDialog::CommitDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceInter
setWindowTitle(i18n("CVS Commit"));
setModal(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel|QDialogButtonBox::Help);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
QPushButton *user1Button = new QPushButton;
user1Button = new QPushButton;
buttonBox->addButton(user1Button, QDialogButtonBox::ActionRole);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
//PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
mainLayout->addWidget(buttonBox);
KGuiItem::assign(user1Button, KGuiItem(i18n("&Diff"));
KGuiItem::assign(user1Button, KGuiItem(i18n("&Diff")));
okButton->setDefault(true);
QFrame* mainWidget = new QFrame(this);
mainLayout->addWidget(mainWidget);
QBoxLayout *layout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(layout);
layout->setSpacing(spacingHint());
layout->setMargin(0);
QLabel *textlabel = new QLabel( i18n("Commit the following &files:"), mainWidget );
mainLayout->addWidget(textlabel);
layout->addWidget(textlabel);
m_fileList = new KListWidget(mainWidget);
m_fileList = new QListWidget(mainWidget);
mainLayout->addWidget(m_fileList);
m_fileList->setEditTriggers(QAbstractItemView::NoEditTriggers);
textlabel->setBuddy(m_fileList);
......@@ -110,7 +103,7 @@ CommitDialog::CommitDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceInter
mainLayout->addWidget(archivelabel);
layout->addWidget(archivelabel);
combo = new KComboBox(mainWidget);
combo = new QComboBox(mainWidget);
mainLayout->addWidget(combo);
archivelabel->setBuddy(combo);
connect( combo, SIGNAL(activated(int)), this, SLOT(comboActivated(int)) );
......@@ -133,24 +126,26 @@ CommitDialog::CommitDialog(KConfig& cfg, OrgKdeCervisiaCvsserviceCvsserviceInter
layout->addWidget(m_useTemplateChk);
connect( m_useTemplateChk, SIGNAL(clicked()), this, SLOT(useTemplateClicked()) );
mainLayout->addWidget(buttonBox);
checkForTemplateFile();
user1Button->setEnabled(false);
connect(user1Button, SIGNAL(clicked()),
this, SLOT(diffClicked()) );
setHelp("commitingfiles");
//setHelp("commitingfiles");
KConfigGroup cg(&partConfig, "CommitDialog");
restoreDialogSize(cg);
restoreGeometry(cg.readEntry<QByteArray>("geometry", QByteArray()));
}
CommitDialog::~CommitDialog()
{
KConfigGroup cg(&partConfig, "CommitDialog");
cg.writeEntry("geometry", saveGeometry());
cg.writeEntry("UseTemplate", m_useTemplateChk->isChecked());
saveDialogSize(cg);
}
......
......@@ -26,9 +26,9 @@
namespace Cervisia { class LogMessageEdit; }
class KComboBox;
class QComboBox;
class QCheckBox;
class KListWidget;
class QListWidget;
class QListWidgetItem;
class OrgKdeCervisiaCvsserviceCvsserviceInterface;
class KConfig;
......@@ -60,9 +60,10 @@ private:
void addTemplateText();
void removeTemplateText();
KListWidget* m_fileList;
QListWidget* m_fileList;
Cervisia::LogMessageEdit* edit;
KComboBox *combo;
QComboBox *combo;
QPushButton *user1Button;
QStringList commits;
int current_index;
QString current_text;
......
......@@ -24,15 +24,15 @@
#include <qpushbutton.h>
#include <QVBoxLayout>
#include <QHBoxLayout>
#include <QLineEdit>
#include <klocale.h>
#include <kurlcompletion.h>
#include <KConfigGroup>
#include <QDialogButtonBox>
#include <QPushButton>
#include <QFileDialog>
#include <kurlcompletion.h>
#include <KConfigGroup>
#include <KLineEdit>
#include <KLocalizedString>
using Cervisia::CvsInitDialog;
......@@ -43,25 +43,17 @@ CvsInitDialog::CvsInitDialog(QWidget* parent)
setWindowTitle(i18n("Create New Repository (cvs init)"));
setModal(true);
QDialogButtonBox *buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok|QDialogButtonBox::Cancel);
QWidget *mainWidget = new QWidget(this);
QVBoxLayout *mainLayout = new QVBoxLayout;
setLayout(mainLayout);
mainLayout->addWidget(mainWidget);
QPushButton *okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton = buttonBox->button(QDialogButtonBox::Ok);
okButton->setDefault(true);
okButton->setShortcut(Qt::CTRL | Qt::Key_Return);
connect(buttonBox, SIGNAL(accepted()), this, SLOT(accept()));
connect(buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
//PORTING SCRIPT: WARNING mainLayout->addWidget(buttonBox) must be last item in layout. Please move it.
mainLayout->addWidget(buttonBox);
okButton->setDefault(true);
QFrame* mainWidget = new QFrame(this);
mainLayout->addWidget(mainWidget);
QVBoxLayout* mainLayout = new QVBoxLayout(mainWidget);
mainLayout->addWidget(mainLayout);
mainLayout->setSpacing(spacingHint());
mainLayout->setMargin(0);
QLabel* dirLabel = new QLabel(i18n("Repository folder:"), mainWidget);
mainLayout->addWidget(dirLabel);
......@@ -70,7 +62,7 @@ CvsInitDialog::CvsInitDialog(QWidget* parent)
QHBoxLayout* dirLayout = new QHBoxLayout();
mainLayout->addLayout(dirLayout);
m_directoryEdit = new QLineEdit(mainWidget);
m_directoryEdit = new KLineEdit(mainWidget);
mainLayout->addWidget(m_directoryEdit);
m_directoryEdit->setFocus();
......@@ -90,7 +82,9 @@ CvsInitDialog::CvsInitDialog(QWidget* parent)
this, SLOT(dirButtonClicked()) );
connect( m_directoryEdit, SIGNAL(textChanged(QString)),
this, SLOT(lineEditTextChanged(QString)));
mainLayout->addWidget(buttonBox);
okButton->setEnabled(false);
setMinimumWidth(350);
......@@ -113,6 +107,6 @@ void CvsInitDialog::dirButtonClicked()
void CvsInitDialog::lineEditTextChanged(const QString& text)
{
okButton->setEnabled(!text.trimmed(.isEmpty();
okButton->setEnabled(!text.trimmed().isEmpty());
}
......@@ -21,7 +21,8 @@
#include <QDialog>
class QLineEdit;
class KLineEdit;
class QPushButton;
namespace Cervisia
......@@ -42,7 +43,8 @@ private slots:
void lineEditTextChanged(const QString& text);
private:
QLineEdit* m_directoryEdit;
KLineEdit* m_directoryEdit;
QPushButton *okButton;
};
......
......@@ -7,7 +7,8 @@ set(cvsservice_bin_KDEINIT_SRCS
repository.cpp
sshagent.cpp
cvsserviceutils.cpp
cvsloginjob.cpp)
cvsloginjob.cpp
../debug.cpp)
qt5_add_dbus_adaptor(cvsservice_bin_KDEINIT_SRCS org.kde.cervisia.cvsservice.xml cvsservice.h CvsService)
......@@ -19,13 +20,11 @@ qt5_add_dbus_adaptor(cvsservice_bin_KDEINIT_SRCS org.kde.cervisia.cvsjob.xml cvs
kf5_add_kdeinit_executable(cvsservice_bin ${cvsservice_bin_KDEINIT_SRCS})
# TODO ecm_mark_nongui_executable(cvsservice_bin)
kf5_add_kdeinit_executable(cvsservice_bin ${cvsservice_bin_KDEINIT_SRCS} NOGUI)
set_target_properties(cvsservice_bin PROPERTIES OUTPUT_NAME cvsservice)
target_link_libraries(kdeinit_cvsservice_bin KF5::KIOCore ${KDE4_KDESU_LIBS} )
set_target_properties(kdeinit_cvsservice_bin PROPERTIES OUTPUT_NAME kdeinit4_cvsservice)
target_link_libraries(kdeinit_cvsservice_bin Qt5::Widgets Qt5::DBus KF5::KIOCore KF5::I18n KF5::WidgetsAddons KF5::Su)
set_target_properties(kdeinit_cvsservice_bin PROPERTIES OUTPUT_NAME kdeinit5_cvsservice)
install(TARGETS kdeinit_cvsservice_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
......@@ -34,16 +33,12 @@ install(TARGETS cvsservice_bin ${INSTALL_TARGETS_DEFAULT_ARGS} )
########### next target ###############
set(cvsaskpass_KDEINIT_SRCS cvsaskpass.cpp )
kf5_add_kdeinit_executable( cvsaskpass ${cvsaskpass_KDEINIT_SRCS})
kf5_add_kdeinit_executable(cvsaskpass cvsaskpass.cpp)
target_link_libraries(kdeinit_cvsaskpass ${KDE4_KDESU_LIBS} )
target_link_libraries(kdeinit_cvsaskpass Qt5::Widgets KF5::WidgetsAddons KF5::CoreAddons KF5::I18n)
install(TARGETS kdeinit_cvsaskpass ${INSTALL_TARGETS_DEFAULT_ARGS} )
target_link_libraries( cvsaskpass kdeinit_cvsaskpass )
install(TARGETS cvsaskpass ${INSTALL_TARGETS_DEFAULT_ARGS} )
......
......@@ -21,36 +21,34 @@
#include <QRegExp>
#include <QApplication>
#include <QCommandLineParser>