From c427bb216b64af7acc17f77b70c5590ead66ce6e Mon Sep 17 00:00:00 2001 From: kervala Date: Sat, 16 Jan 2016 15:52:51 +0100 Subject: [PATCH] Fixed: Compilation with Qt 5 and STLport (std::move doesn't exist) --HG-- branch : develop --- code/nel/tools/3d/panoply_preview/main_window.h | 6 ++++++ code/nel/tools/3d/panoply_preview/panoply_preview.h | 6 ++++++ code/nel/tools/3d/shared_widgets/command_log.h | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/code/nel/tools/3d/panoply_preview/main_window.h b/code/nel/tools/3d/panoply_preview/main_window.h index 3e3d2f025..1d864249b 100644 --- a/code/nel/tools/3d/panoply_preview/main_window.h +++ b/code/nel/tools/3d/panoply_preview/main_window.h @@ -21,6 +21,12 @@ // STL includes // Qt includes +#include + +#ifdef Q_COMPILER_RVALUE_REFS +#undef Q_COMPILER_RVALUE_REFS +#endif + #include // NeL includes diff --git a/code/nel/tools/3d/panoply_preview/panoply_preview.h b/code/nel/tools/3d/panoply_preview/panoply_preview.h index 9fbe2bad3..794a223f8 100644 --- a/code/nel/tools/3d/panoply_preview/panoply_preview.h +++ b/code/nel/tools/3d/panoply_preview/panoply_preview.h @@ -21,6 +21,12 @@ // STL includes // Qt includes +#include + +#ifdef Q_COMPILER_RVALUE_REFS +#undef Q_COMPILER_RVALUE_REFS +#endif + #include #include #include diff --git a/code/nel/tools/3d/shared_widgets/command_log.h b/code/nel/tools/3d/shared_widgets/command_log.h index d92f84b72..a496095d2 100644 --- a/code/nel/tools/3d/shared_widgets/command_log.h +++ b/code/nel/tools/3d/shared_widgets/command_log.h @@ -34,6 +34,12 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. // STL includes // Qt includes +#include + +#ifdef Q_COMPILER_RVALUE_REFS +#undef Q_COMPILER_RVALUE_REFS +#endif + #include #include #include