Fixes for 1.4 release

alphaonex86 · Feb 23, 2018 · 58a774c · 58a774c
1 parent 6414ec1
commit 58a774c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ResourcesManager.h b/ResourcesManager.h
@@ -35,7 +35,7 @@ class ResourcesManager : public QObject
         /// \brief add / or \ in function of the platform at the end of path if both / and \ are not found
         static std::string AddSlashIfNeeded(const std::string &path);
         /// \brief get the writable path
-        const std::__cxx11::string &getWritablePath() const;
+        const std::string &getWritablePath() const;
         /// \brief disable the writable path, if ultracopier is unable to write into
         bool disableWritablePath();
         /// \brief get the read path

diff --git a/other-pro/ultracopier-core.pro b/other-pro/ultracopier-core.pro
@@ -1,7 +1,7 @@
 CONFIG += c++11
 QMAKE_CXXFLAGS+="-std=c++0x -Wall -Wextra"
 mac:QMAKE_CXXFLAGS+="-stdlib=libc++"
-QMAKE_CXXFLAGS+="-Wall -Wextra -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-unused-macros -Wno-newline-eof -Wno-exit-time-destructors -Wno-global-constructors -Wno-gnu-zero-variadic-macro-arguments -Wno-documentation -Wno-shadow -Wno-missing-prototypes -Wno-padded -Wno-covered-switch-default -Wno-old-style-cast -Wno-documentation-unknown-command -Wno-switch-enum -Wno-undefined-reinterpret-cast -Wno-unreachable-code-break -Wno-sign-conversion -Wno-float-conversion"
+#QMAKE_CXXFLAGS+="-Wall -Wextra -Weverything -Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-unused-macros -Wno-newline-eof -Wno-exit-time-destructors -Wno-global-constructors -Wno-gnu-zero-variadic-macro-arguments -Wno-documentation -Wno-shadow -Wno-missing-prototypes -Wno-padded -Wno-covered-switch-default -Wno-old-style-cast -Wno-documentation-unknown-command -Wno-switch-enum -Wno-undefined-reinterpret-cast -Wno-unreachable-code-break -Wno-sign-conversion -Wno-float-conversion"
 
 TEMPLATE = app
 QT += network xml widgets