From 93ed4cd697c55d53e927f85e474196d5b0214fb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Minisini?= Date: Sat, 21 Jan 2017 21:14:42 +0000 Subject: [PATCH] [GB.QT5.EXT] * BUG: The component now should compile correctly with C++11. git-svn-id: svn://localhost/gambas/trunk@8061 867c0c6c-44f3-4631-809d-bfa615b0a4ec --- gb.qt5/configure.ac | 7 ------- gb.qt5/src/ext/Makefile.am | 1 + 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/gb.qt5/configure.ac b/gb.qt5/configure.ac index c2c9fd045..e0fe7d81b 100644 --- a/gb.qt5/configure.ac +++ b/gb.qt5/configure.ac @@ -15,11 +15,6 @@ GB_COMPONENT_PKG_CONFIG( 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5Svg Qt5PrintSupport Qt5X11Extras x11 ) -## GB_COMPONENT_PKG_CONFIG( -## qt5ext, QT5EXT, gb.qt5.ext, [ext], -## 'Qt5Core >= 5.4.0' Qt5Gui Qt5Widgets -## ) - GB_COMPONENT_PKG_CONFIG( qt5webkit, QT5WEBKIT, gb.qt5.webkit, [webkit], 'Qt5Core >= 5.3.0' Qt5Gui Qt5Widgets Qt5Network Qt5Xml Qt5WebKit Qt5WebKitWidgets Qt5PrintSupport x11 @@ -55,6 +50,4 @@ src/opengl/Makefile \ src/ext/Makefile \ ) -## src/ext/Makefile \ - GB_PRINT_MESSAGES diff --git a/gb.qt5/src/ext/Makefile.am b/gb.qt5/src/ext/Makefile.am index 5c5d10737..0f6754ba5 100644 --- a/gb.qt5/src/ext/Makefile.am +++ b/gb.qt5/src/ext/Makefile.am @@ -6,6 +6,7 @@ gblib_LTLIBRARIES = gb.qt5.ext.la gb_qt5_ext_la_LIBADD = @QT5EXT_LIB@ gb_qt5_ext_la_LDFLAGS = -module @LD_FLAGS@ @QT5EXT_LDFLAGS@ +gb_qt5_ext_la_CXXFLAGS = @THREAD_INC@ $(AM_CXXFLAGS) -std=c++11 gb_qt5_ext_la_CPPFLAGS = @QT5EXT_INC@ -I$(top_srcdir)/share -I$(top_srcdir)/src/share gb_qt5_ext_la_SOURCES = \