mirror of
https://invent.kde.org/system/dolphin
synced 2024-09-17 15:31:20 +00:00
Do not build KNS installer and KNS button on Windows
This commit is contained in:
parent
8d7775b174
commit
e8c4500459
|
@ -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
|
||||||
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) :
|
||||||
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());
|
||||||
|
|
Loading…
Reference in a new issue