summaryrefslogtreecommitdiffstats
path: root/src/plugins
diff options
context:
space:
mode:
authorDonald Carr <sirspudd@gmail.com>2013-10-02 00:10:01 -0700
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-10-02 10:32:29 +0200
commit3e1c3a051dc12b222fcf3efa185ebd13f823bc8d (patch)
tree8b0c1cfba5eef82bdf6f173624f82efc78f0588b /src/plugins
parent150b8ca29417de2cd423ff92478eaf4cb2906601 (diff)
Fix clang build for libc++
Successfully builds Qt 5.2 with: QMAKE_CXXFLAGS_CXX11 += -std=c++11 -stdlib=libc++ QMAKE_LFLAGS_CXX11 += -stdlib=libc++ -lc++abi against: clang version 3.3 (tags/RELEASE_33/final) Change-Id: I778f9410c6563e78bc77ae4c20097fa561503ba1 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r--src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp1
-rw-r--r--src/plugins/platforms/xcb/qxcbsessionmanager.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
index c222b62a36..4cfc2a6cc4 100644
--- a/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
+++ b/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp
@@ -57,6 +57,7 @@
#include <string.h> // strchr, strncmp, etc.
#include <strings.h> // strncasecmp
+#include <clocale> // LC_CTYPE
TableGenerator::TableGenerator() : m_state(NoErrors),
m_systemComposeDir(QString())
diff --git a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
index 6abe24b7ab..a3d6a65695 100644
--- a/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
+++ b/src/plugins/platforms/xcb/qxcbsessionmanager.cpp
@@ -49,6 +49,7 @@
#include <qsocketnotifier.h>
#include <X11/SM/SMlib.h>
+#include <cerrno> // ERANGE
class QSmSocketReceiver : public QObject
{