diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-05 15:41:11 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-05-05 16:15:38 +0200 |
| commit | a2f63a4c846f2bb62a3c754d1e75ca68fcb4e442 (patch) | |
| tree | 276e7e3de3e724befa6427cb425b736f5f26dd58 | |
| parent | d25bfeb4c5ecb3d10b87a9f5e2e9e68e05592bfc (diff) | |
| parent | 388d512b0903455236ec1057e8213204000f5b5d (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.9
Change-Id: Icb174588038f02582b395529bffc98f50e91e141
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | generator/shiboken2/cppgenerator.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dae9999..7695df5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,11 +20,11 @@ option(BUILD_TESTS "Build tests." TRUE) option(USE_PYTHON_VERSION "Use specific python version to build shiboken2." "") if (USE_PYTHON_VERSION) - find_package(PythonLibs ${USE_PYTHON_VERSION} REQUIRED) find_package(PythonInterp ${USE_PYTHON_VERSION} REQUIRED) + find_package(PythonLibs ${USE_PYTHON_VERSION} REQUIRED) else() - find_package(PythonLibs 2.6) find_package(PythonInterp 2.6) + find_package(PythonLibs 2.6) endif() set(CLANG_DIR $ENV{CLANG_INSTALL_DIR}) diff --git a/generator/shiboken2/cppgenerator.cpp b/generator/shiboken2/cppgenerator.cpp index f8b90af..cb432fe 100644 --- a/generator/shiboken2/cppgenerator.cpp +++ b/generator/shiboken2/cppgenerator.cpp @@ -4960,7 +4960,7 @@ void CppGenerator::writeTypeDiscoveryFunction(QTextStream& s, const AbstractMeta } QString CppGenerator::writeSmartPointerGetterCast() { - return QStringLiteral("const_cast<char *>(" SMART_POINTER_GETTER ")"); + return QLatin1String("const_cast<char *>(" SMART_POINTER_GETTER ")"); } void CppGenerator::writeSetattroFunction(QTextStream &s, GeneratorContext &context) |