projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9ad0c72
)
Fix build with snorenotify 0.7
173/head
author
Hannah von Reth
<vonreth@kde.org>
Thu, 3 Dec 2015 14:49:23 +0000
(15:49 +0100)
committer
Hannah von Reth
<vonreth@kde.org>
Thu, 14 Jan 2016 22:12:33 +0000
(23:12 +0100)
CMakeLists.txt
patch
|
blob
|
history
appveyor.yml
patch
|
blob
|
history
src/qtui/CMakeLists.txt
patch
|
blob
|
history
src/qtui/snorenotificationbackend.cpp
patch
|
blob
|
history
src/qtui/ui/snorentificationconfigwidget.ui
patch
|
blob
|
history
diff --git
a/CMakeLists.txt
b/CMakeLists.txt
index
c2ef8b2
..
2c29af4
100644
(file)
--- a/
CMakeLists.txt
+++ b/
CMakeLists.txt
@@
-217,12
+217,21
@@
if (USE_QT5)
PURPOSE "Required for audio notifications"
)
PURPOSE "Required for audio notifications"
)
- find_package(LibsnoreQt5 0.
5.7
0 QUIET)
+ find_package(LibsnoreQt5 0.
7.
0 QUIET)
set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
URL "https://projects.kde.org/projects/playground/libs/snorenotify"
DESCRIPTION "a cross-platform notification framework"
PURPOSE "Enable support for the snorenotify framework"
)
set_package_properties(LibsnoreQt5 PROPERTIES TYPE OPTIONAL
URL "https://projects.kde.org/projects/playground/libs/snorenotify"
DESCRIPTION "a cross-platform notification framework"
PURPOSE "Enable support for the snorenotify framework"
)
+ if(LibsnoreQt5_FOUND)
+ find_package(LibsnoreSettingsQt5)
+ set_package_properties(LibsnoreSettingsQt5 PROPERTIES TYPE REQUIRED
+ URL "https://projects.kde.org/projects/playground/libs/snorenotify"
+ DESCRIPTION "a cross-platform notification framework"
+ PURPOSE "Enable support for the snorenotify framework"
+ )
+ endif()
+
if (WITH_WEBKIT)
find_package(Qt5WebKit QUIET)
if (WITH_WEBKIT)
find_package(Qt5WebKit QUIET)
diff --git
a/appveyor.yml
b/appveyor.yml
index
bb7cfc1
..
cd35363
100644
(file)
--- a/
appveyor.yml
+++ b/
appveyor.yml
@@
-12,7
+12,7
@@
build_script:
Init @("ninja", "png2ico", "nsis") ([ordered]@{"git://anongit.kde.org/extra-cmake-modules.git" = @{"branch" = "master"};
"https://github.com/Snorenotify/SnoreGrowl.git" = @{"branch" = "v0.4.0"; "buildType" = "Release"};
Init @("ninja", "png2ico", "nsis") ([ordered]@{"git://anongit.kde.org/extra-cmake-modules.git" = @{"branch" = "master"};
"https://github.com/Snorenotify/SnoreGrowl.git" = @{"branch" = "v0.4.0"; "buildType" = "Release"};
- "git://anongit.kde.org/snorenotify.git" = @{"branch" = "v0.
6
.0"; "buildType" = "Release"}})
+ "git://anongit.kde.org/snorenotify.git" = @{"branch" = "v0.
7
.0"; "buildType" = "Release"}})
mkdir -Force $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
mkdir -Force $env:APPVEYOR_BUILD_FOLDER\work\build\$env:APPVEYOR_PROJECT_NAME
@@
-34,11
+34,8
@@
build_script:
#snore
"bin\\.*snore.*\.dll",
"lib\\plugins\\libsnore.*\\libsnore_backend.*\.dll",
#snore
"bin\\.*snore.*\.dll",
"lib\\plugins\\libsnore.*\\libsnore_backend.*\.dll",
- "lib\\plugins\\libsnore.*\\libsnore_secondary_backend.*\.dll",
- #snorenotify 0.5
- "lib\\libsnore.*\\libsnore_backend.*\.dll",
- #
- "bin\\SnoreToast\.exe",
+ "lib\\plugins\\libsnore.*\\libsnore_settings_backend.*\.dll",
+ "lib\\plugins\\libsnore.*\\libsnore_secondarybackend.*\.dll", "lib\\plugins\\libsnore.*\\libsnore_settings_secondarybackend.*\.dll", "bin\\SnoreToast\.exe",
#
#Growl
"bin\\.*snoregrowl.*\.dll",
#
#Growl
"bin\\.*snoregrowl.*\.dll",
diff --git
a/src/qtui/CMakeLists.txt
b/src/qtui/CMakeLists.txt
index
6987ec6
..
8510a71
100644
(file)
--- a/
src/qtui/CMakeLists.txt
+++ b/
src/qtui/CMakeLists.txt
@@
-99,7
+99,7
@@
if (LibsnoreQt5_FOUND)
add_definitions(-DHAVE_LIBSNORE)
list(APPEND SOURCES snorenotificationbackend.cpp)
list(APPEND FORMS snorentificationconfigwidget.ui)
add_definitions(-DHAVE_LIBSNORE)
list(APPEND SOURCES snorenotificationbackend.cpp)
list(APPEND FORMS snorentificationconfigwidget.ui)
- list(APPEND LIBS Snore::Libsnore)
+ list(APPEND LIBS Snore::Libsnore
Snore::LibsnoreSettings
)
endif()
if (PHONON_FOUND OR Phonon4Qt5_FOUND)
endif()
if (PHONON_FOUND OR Phonon4Qt5_FOUND)
diff --git
a/src/qtui/snorenotificationbackend.cpp
b/src/qtui/snorenotificationbackend.cpp
index
72873c1
..
69ce0e0
100644
(file)
--- a/
src/qtui/snorenotificationbackend.cpp
+++ b/
src/qtui/snorenotificationbackend.cpp
@@
-43,9
+43,9
@@
SnoreNotificationBackend::SnoreNotificationBackend (QObject *parent)
Snore::SnoreCore::instance().loadPlugins(
#ifndef HAVE_KDE
Snore::SnoreCore::instance().loadPlugins(
#ifndef HAVE_KDE
- Snore::SnorePlugin::B
ACKEND
|
+ Snore::SnorePlugin::B
ackend
|
#endif
#endif
- Snore::SnorePlugin::S
ECONDARY_BACKEND
);
+ Snore::SnorePlugin::S
econdaryBackend | Snore::SnorePlugin::Settings
);
m_application = Snore::Application("Quassel", m_icon);
m_application.hints().setValue("windows-app-id","QuasselProject.QuasselIRC");
m_application.hints().setValue("pushover-token", "arNtsi983QSZUqU3KAZrFLKHGFPkdL");
m_application = Snore::Application("Quassel", m_icon);
m_application.hints().setValue("windows-app-id","QuasselProject.QuasselIRC");
m_application.hints().setValue("pushover-token", "arNtsi983QSZUqU3KAZrFLKHGFPkdL");
@@
-91,7
+91,7
@@
void SnoreNotificationBackend::close(uint notificationId)
}
#endif
Snore::Notification n = Snore::SnoreCore::instance().getActiveNotificationByID(m_notificationIds.take(notificationId));
}
#endif
Snore::Notification n = Snore::SnoreCore::instance().getActiveNotificationByID(m_notificationIds.take(notificationId));
- Snore::SnoreCore::instance().requestCloseNotification(n, Snore::Notification::C
LOSED
);
+ Snore::SnoreCore::instance().requestCloseNotification(n, Snore::Notification::C
losed
);
}
void SnoreNotificationBackend::actionInvoked(Snore::Notification n)
}
void SnoreNotificationBackend::actionInvoked(Snore::Notification n)
diff --git
a/src/qtui/ui/snorentificationconfigwidget.ui
b/src/qtui/ui/snorentificationconfigwidget.ui
index
991e37b
..
117fc98
100644
(file)
--- a/
src/qtui/ui/snorentificationconfigwidget.ui
+++ b/
src/qtui/ui/snorentificationconfigwidget.ui
@@
-55,7
+55,7
@@
<customwidget>
<class>Snore::SettingsDialog</class>
<extends>QWidget</extends>
<customwidget>
<class>Snore::SettingsDialog</class>
<extends>QWidget</extends>
- <header location="global">libsnore/settingsdialog.h</header>
+ <header location="global">libsnore/settings
/settings
dialog.h</header>
<container>1</container>
</customwidget>
</customwidgets>
<container>1</container>
</customwidget>
</customwidgets>