fix build

ossia · Jul 30, 2018 · bfd01af · bfd01af
1 parent a076fa3
commit bfd01af
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/CMake/GenerateLicense.cmake b/CMake/GenerateLicense.cmake
@@ -1,6 +1,6 @@
 function(AddLicenseFile _text _name _file)
   file(READ "${_file}" _fileText)
-  set("${_text}" "${${_text}}\n\nstatic const constexpr auto ${_name}_LICENSE = R\"___(${_fileText})___\"\;" PARENT_SCOPE)
+  set("${_text}" "${${_text}}\n\nstatic const auto ${_name}_LICENSE = QStringLiteral(R\"___(${_fileText})___\")\;" PARENT_SCOPE)
 endfunction()
 
 function(AddLicenseStub _text _name _file _startLine _endLine)

diff --git a/base/lib/core/presenter/AboutDialog.cpp b/base/lib/core/presenter/AboutDialog.cpp
@@ -69,20 +69,20 @@ AboutDialog::AboutDialog(QWidget *parent) :
   map["RtMidi17"] = License{"https://github.com/jcelerier/RtMidi17",
                             "Based on RtMidi (https://github.com/thestk/rtmidi) and "
                             "ModernMIDI (https://github.com/ddiakopoulos/ModernMIDI)\n"
-                            "RtMidi license: " rtmidi_LICENSE
-                            "\n\nModernMidi license: " modernmidi_LICENSE
+                            "RtMidi license: " + rtmidi_LICENSE +
+                            "\n\nModernMidi license: " + modernmidi_LICENSE
   };
-  map["Servus"] = License{"https://github.com/jcelerier/Servus", "Based on https://github.com/HBPVIS/Servus\n" servus_LICENSE};
+  map["Servus"] = License{"https://github.com/jcelerier/Servus", "Based on https://github.com/HBPVIS/Servus\n" + servus_LICENSE};
 
   map["SmallFunction"] = License{"https://github.com/jcelerier/SmallFunction"
-      , "Based on https://github.com/LoopPerfect/smallfunction\n" smallfun_LICENSE};
+      , "Based on https://github.com/LoopPerfect/smallfunction\n" + smallfun_LICENSE};
 
   map["bitset2"] = License{"https://github.com/ClaasBontus/bitset2", bitset2_LICENSE};
   map["Brigand"] = License{"https://github.com/edouarda/brigand", Brigand_LICENSE};
   map["Chobo"] = License{"https://github.com/Chobolabs/chobo-shl", chobo_LICENSE};
   map["ConcurrentQueue"] = License{"https://github.com/cameron314/concurrentqueue", concurrentqueue_LICENSE};
   map["ReaderWriterQueue"] = License{"https://github.com/cameron314/readerwriterqueue", readerwriterqueue_LICENSE};
-  map["flat"] = License{"https://github.com/jcelerier/flat", "Based on https://github.com/pubby/flat\n" flat_LICENSE};
+  map["flat"] = License{"https://github.com/jcelerier/flat", "Based on https://github.com/pubby/flat\n" + flat_LICENSE};
   map["flat_hash_map"] = License{"https://github.com/jcelerier/flat_hash_map"
       , "Based on https://github.com/skarupke/flat_hash_map\n" };
   map["fmt"] = License{"https://github.com/fmtlib/fmt", fmt_LICENSE};

diff --git a/tools/sdk/Linux/gcc-deps.sh b/tools/sdk/Linux/gcc-deps.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 cd /image
-BINUTILS=binutils-2.30
+BINUTILS=binutils-2.31.1
 MPC=mpc-1.0.3
 MPFR=mpfr-3.1.4
 GMP=gmp-6.1.2