Commit e8c45004 authored by Alexander Lohnau's avatar Alexander Lohnau Committed by Elvis Angelaccio
Browse files

Do not build KNS installer and KNS button on Windows

parent 8d7775b1
...@@ -391,7 +391,10 @@ install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} ) ...@@ -391,7 +391,10 @@ install(TARGETS kcm_dolphinnavigation DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(TARGETS kcm_dolphinservices DESTINATION ${KDE_INSTALL_PLUGINDIR} ) install(TARGETS kcm_dolphinservices DESTINATION ${KDE_INSTALL_PLUGINDIR} )
install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} ) install(TARGETS kcm_dolphingeneral DESTINATION ${KDE_INSTALL_PLUGINDIR} )
add_subdirectory(settings/services/servicemenuinstaller) if(NOT WIN32)
add_subdirectory(settings/services/servicemenuinstaller)
install( FILES settings/services/servicemenu.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} )
endif()
########### install files ############### ########### install files ###############
...@@ -415,7 +418,6 @@ install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTAL ...@@ -415,7 +418,6 @@ install( FILES settings/kcm/kcmdolphinviewmodes.desktop DESTINATION ${KDE_INSTAL
install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphinnavigation.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphinservices.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} ) install( FILES settings/kcm/kcmdolphingeneral.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR} )
install( FILES settings/services/servicemenu.knsrc DESTINATION ${KDE_INSTALL_KNSRCDIR} )
if(BUILD_TESTING) if(BUILD_TESTING)
find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED)
......
...@@ -69,15 +69,19 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) : ...@@ -69,15 +69,19 @@ ServicesSettingsPage::ServicesSettingsPage(QWidget* parent) :
m_listView->setVerticalScrollMode(QListView::ScrollPerPixel); m_listView->setVerticalScrollMode(QListView::ScrollPerPixel);
connect(m_listView, &QListView::clicked, this, &ServicesSettingsPage::changed); connect(m_listView, &QListView::clicked, this, &ServicesSettingsPage::changed);
#ifndef Q_OS_WIN
auto *downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."), auto *downloadButton = new KNS3::Button(i18nc("@action:button", "Download New Services..."),
QStringLiteral("servicemenu.knsrc"), QStringLiteral("servicemenu.knsrc"),
this); this);
connect(downloadButton, &KNS3::Button::dialogFinished, this, &ServicesSettingsPage::loadServices); connect(downloadButton, &KNS3::Button::dialogFinished, this, &ServicesSettingsPage::loadServices);
#endif
topLayout->addWidget(label); topLayout->addWidget(label);
topLayout->addWidget(m_searchLineEdit); topLayout->addWidget(m_searchLineEdit);
topLayout->addWidget(m_listView); topLayout->addWidget(m_listView);
#ifndef Q_OS_WIN
topLayout->addWidget(downloadButton); topLayout->addWidget(downloadButton);
#endif
m_enabledVcsPlugins = VersionControlSettings::enabledPlugins(); m_enabledVcsPlugins = VersionControlSettings::enabledPlugins();
std::sort(m_enabledVcsPlugins.begin(), m_enabledVcsPlugins.end()); std::sort(m_enabledVcsPlugins.begin(), m_enabledVcsPlugins.end());
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment