summaryrefslogtreecommitdiffstats
path: root/generators/shiboken/shibokennormalize_p.h
diff options
context:
space:
mode:
authorHugo Parente Lima <hugo.pl@gmail.com>2012-02-23 20:35:14 -0200
committerHugo Parente Lima <hugo.pl@gmail.com>2012-02-23 20:35:14 -0200
commitfde271521a750b7d5936435f8fcac4b86c8540f1 (patch)
treeca72de13df2cb2a979419c57ebc7b733cc36fcaf /generators/shiboken/shibokennormalize_p.h
parent2c198ea403aa6c374bc062f85ac95b61acbb87ae (diff)
parentbbb7d417e75043dec53c84ceafec5c07cc282a81 (diff)
downloadshiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.tar.gz
shiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.tar.xz
shiboken-fde271521a750b7d5936435f8fcac4b86c8540f1.zip
Merge GeneratorRunner project into Shiboken.HEADmaster
This initial merge introduces few regression that can easily be fixed, they are: - You can't choose what generator will be run, it always run CppGenerator and HeaderGenerator. - DummyGenerator test of GeneratorRunner was commented out. The directory structure is also nto ideal and may change a bit in later commits. Conflicts: CMakeLists.txt data/CMakeLists.txt doc/CMakeLists.txt doc/_templates/index.html doc/_templates/layout.html doc/_themes/pysidedocs/static/pysidedocs.css doc/commandlineoptions.rst doc/conf.py.in doc/contents.rst doc/images/bindinggen-development.png doc/images/boostqtarch.png tests/CMakeLists.txt
Diffstat (limited to 'generators/shiboken/shibokennormalize_p.h')
-rw-r--r--generators/shiboken/shibokennormalize_p.h41
1 files changed, 41 insertions, 0 deletions
diff --git a/generators/shiboken/shibokennormalize_p.h b/generators/shiboken/shibokennormalize_p.h
new file mode 100644
index 00000000..0a55b507
--- /dev/null
+++ b/generators/shiboken/shibokennormalize_p.h
@@ -0,0 +1,41 @@
+/*
+ * This file is part of the PySide project.
+ *
+ * Copyright (C) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
+ *
+ * Contact: PySide team <contact@pyside.org>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SHIBOKENNORMALIZE_P_H
+#define SHIBOKENNORMALIZE_P_H
+
+#include <QMetaObject>
+#include <QByteArray>
+
+
+#if (QT_VERSION < QT_VERSION_CHECK(4, 7, 0))
+ QByteArray QMetaObject_normalizedTypeQt47(const char *type);
+ QByteArray QMetaObject_normalizedSignatureQt47(const char *type);
+
+ #define SBK_NORMALIZED_TYPE(x) QMetaObject_normalizedTypeQt47(x)
+ #define SBK_NORMALIZED_SIGNATURE(x) QMetaObject_normalizedSignatureQt47(x)
+#else
+ #define SBK_NORMALIZED_TYPE(x) QMetaObject::normalizedType(x)
+ #define SBK_NORMALIZED_SIGNATURE(x) QMetaObject::normalizedSignature(x)
+#endif
+
+#endif //SHIBOKENNORMALIZE_P_H