Le 17/04/2016 14:12, Stephan Witt a écrit :
Am 17.04.2016 um 11:46 schrieb Kornel Benko <kor...@lyx.org>:
Am Sonntag, 17. April 2016 um 01:34:41, schrieb Guillaume Munch <g...@lyx.org>
commit 367a7a6dddc7917d5e99fa6ba894812ad6f62e48
Author: Guillaume Munch <g...@lyx.org>
Date: Tue Mar 22 21:57:17 2016 +0000
LyXToolBox: a QToolBox with minimum size management
Compiling with QT5 I get:
In file included from
/usr2/src/lyx/lyx-2.0.x-git/src/frontends/qt4/LyXToolBox.cpp:12:0:
/usr2/src/lyx/lyx-2.0.x-git/src/frontends/qt4/LyXToolBox.h:15:26: fatal error:
QtGui/QToolBox: No such file or directory
compilation terminated.
make[2]: ***
[src/frontends/qt4/CMakeFiles/frontend_qt.dir/usr2/src/lyx/lyx-2.0.x-git/src/frontends/qt4/LyXToolBox.cpp.o]
Error 1
There is only 1 file named QToolBox in QT5.x:
"QtWidgets/QToolBox"
Kornel
On Mac the attached patch helps.
But LyXToolBox.cpp doesn’t compile with cxx11 enabled on Mac.
======
In file included from
/Users/stephan/git/lyx/src/frontends/qt4/LyXToolBox.cpp:17:
In file included from /Users/stephan/git/lyx/src/support/debug.h:18:
/Users/stephan/git/lyx/src/support/strfwd.h:50:19: error: explicit
specialization of non-template struct 'char_traits'
template<> struct char_traits<char>;
^ ~~~~~~
/Users/stephan/git/lyx/src/support/strfwd.h:50:19: error: redefinition of
'char_traits' as different kind of symbol
/Users/stephan/git/lyx/src/support/strfwd.h:49:32: note: previous definition is
here
template<typename Char> struct char_traits;
^
/Users/stephan/git/lyx/src/support/strfwd.h:56:9: error: unknown type name
'basic_string'; did you mean 'basic_stringbuf'?
typedef basic_string<char, char_traits<char>, allocator<char> > string;
^~~~~~~~~~~~
basic_stringbuf
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../include/c++/v1/iosfwd:117:33:
note: 'basic_stringbuf' declared here
class _LIBCPP_TYPE_VIS_ONLY basic_stringbuf;
^
=====
Can you please try the attached? It might be due to this omission.
>From 0abd0814ef802b2d9084cc22ab028731ad89c42b Mon Sep 17 00:00:00 2001
From: Guillaume Munch <g...@lyx.org>
Date: Sun, 17 Apr 2016 15:16:31 +0100
Subject: [PATCH] Include config.h in LyXToolBox.cpp
Amend 367a7a6dd.
---
src/frontends/qt4/LyXToolBox.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/frontends/qt4/LyXToolBox.cpp b/src/frontends/qt4/LyXToolBox.cpp
index fcd3dbe..4e754f9 100644
--- a/src/frontends/qt4/LyXToolBox.cpp
+++ b/src/frontends/qt4/LyXToolBox.cpp
@@ -9,6 +9,8 @@
* Full author contact details are available in file CREDITS.
*/
+#include <config.h>
+
#include "LyXToolBox.h"
#include <QApplication>
--
2.1.4
