QmlDesigner: cleanup code

Change-Id: Ibebef6313113ff0097586373795e6117b7112876 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

QmlDesigner: cleanup code
Change-Id: Ibebef6313113ff0097586373795e6117b7112876 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
d315a71c · Tim Jenssen · Thomas Hartmann · 0370fa21 · d315a71c
Commit d315a71c authored Aug 04, 2014 by Tim Jenssen Committed by Thomas Hartmann Aug 05, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 8 deletions

share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp ...e/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp +2 -8

No files found.
--- a/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
+++ b/share/qtcreator/qml/qmlpuppet/container/sharedmemory_unix.cpp
@@ -49,16 +49,10 @@

 #include <private/qcore_unix_p.h>

-#ifdef Q_OS_OSX
-#define NAME_MAX PSHMNAMLEN
-#endif
-
-#ifndef QStringLiteral
-#define QStringLiteral(str) QString::fromUtf8(str)
+#if (QT_VERSION < QT_VERSION_CHECK(5, 0, 0))
+#define QStringLiteral(str) QLatin1String(str)
 #endif

-#include <QRegExp>
-
 namespace QmlDesigner {

 class SharedMemoryLocker