Merge pull request #173 from TheOneRing/snor_next

Fix build with snorenotify 0.7

diff --combined appveyor.yml
index 743531d,cd35363..a97c2e2
--- 1/appveyor.yml
--- 2/appveyor.yml
+++ b/appveyor.yml
@@@ -10,9 -10,9 +10,9 @@@ build_script
  
      Import-Module $env:APPVEYOR_BUILD_FOLDER\work\appveyorHelp.psm1
  
 -    Init @("ninja", "png2ico", "nsis") ([ordered]@{"git://anongit.kde.org/extra-cmake-modules.git" = @{"branch" = "master"};
 +    Init @("ninja", "png2ico", "nsis", "7zip.commandline") ([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
@@@ -34,18 -34,15 +34,15 @@@
                              #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",
                              #
                              #ssl
 -                            "bin\\libeay32\.dll",
 -                            "bin\\ssleay32\.dll",
 +                            ".*\\libeay32\.dll",
 +                            ".*\\ssleay32\.dll",
                              #
                              #icu
                              "bin\\icuin\d+\.dll",
@@@ -93,22 -90,25 +90,22 @@@
                              "plugins\\phonon_backend\\.*",
                              "plugins\\phonon4qt5_backend\\.*") @(
                              #blacklist
 +                            "include",
                              ".*\.h",
 -                            "lib\\plugins\\libsnore.*\\libsnore_backend_freedesktop\.dll"
 +                            "lib\\plugins\\libsnore.*\\libsnore_backend_freedesktop\.dll",
 +                            ".*\.pdb",
 +                            ".*plugind\.dll"
                              )
  
      mv "$imageDir\bin\*" "$imageDir\"
      #mv "$imageDir\lib\qca-qt5\crypto" "$imageDir\crypto"
 +    mv "$imageDir\qml\*" "$imageDir"
      mv "$imageDir\plugins\*" "$imageDir"
      if(Test-Path "$imageDir\lib\plugins")
      {
          mv "$imageDir\lib\plugins\*" "$imageDir"
      }
 -    #snorenotify 0.5 plugins
 -    if(Test-Path "$imageDir\lib\libsnore-qt5")
 -    {
 -        mv "$imageDir\lib\libsnore-qt5\*" "$imageDir"
 -    }
 -    rm -Recurse "$imageDir\plugins\*"
 -    rm -Recurse "$imageDir\lib"
 -    rm -Recurse "$imageDir\bin"
 +    DeleteEmptyFodlers $imageDir
      7ZipDeployImage
      NsisDeployImage $env:APPVEYOR_BUILD_FOLDER\scripts\build\NullsoftInstaller.nsi
  
@@@ -116,11 -116,11 +113,11 @@@ environment
      QT_VER: 5.5
  
      matrix:
 -    #mingw
 -    - COMPILER: mingw492_32
      #msvc
 -    - COMPILER: msvc2013
      - COMPILER: msvc2013_64
 +    - COMPILER: msvc2013
 +    #mingw
 +    - COMPILER: mingw492_32
  
  test: off