aboutsummaryrefslogtreecommitdiffstats
path: root/sources/shiboken2/ApiExtractor
Commit message (Collapse)AuthorAgeFilesLines
* shiboken: Remove data fields representing unimplemented attributesFriedemann Kleint2018-08-305-174/+4
| | | | | | | | | Remove member variables and enumeration values. Task-number: PYSIDE-743 Change-Id: Id7bff33b180e99e19d02bd895e45e4f0749dc042 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
* Clarify template error messageTilman Roeder2018-08-201-1/+1
| | | | | Change-Id: I928ed3d07cd66393675d014050c3bf3ab2ea5c49 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* shiboken: Implement template inheritance for fieldsFriedemann Kleint2018-08-033-0/+120
| | | | | | | | | Add the fields to the typedef'ed class specializing the type similar to the functions. Task-number: PYSIDE-725 Change-Id: I2daae9bd3c8a73fbd868f495cfc3a2dfba703103 Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken: Refactor code involved in inheriting template classesFriedemann Kleint2018-08-034-70/+81
| | | | | | | | | | | | | | | | - Add a helper template to conveniently search for a MetaClass by name and convenience function to search in lists. - Remove parameter bool *ok from AbstractMetaBuilderPrivate::inheritTemplateType() and check on returned pointer instead. - In the inheritTemplate*() functions, use QScopedPointer to ensure the result is deleted on failure. - Search for a shadowing function first before creating the copy in inheritTemplate(). Task-number: PYSIDE-725 Change-Id: I3183087fb42b22a2189c17b94eaafdb4c1151f0e Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken: Add template base class to the debug operator of AbstractMetaClassFriedemann Kleint2018-08-011-0/+2
| | | | | | Task-number: PYSIDE-725 Change-Id: I68a57bbd98d111faa42dc62b667985281517df31 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Simplify TypeDatabase::findTypes()Friedemann Kleint2018-07-311-5/+2
| | | | | | | | | | Use QMultiMap::equal_range(). Amends a6d12454983f8b1f2f8e7087de4b11ccd9126178 Task-number: PYSIDE-757 Change-Id: I82018ca78226f8fe45cd1ab43d8c05a0b0fc8811 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Code cleanupFriedemann Kleint2018-07-312-19/+5
| | | | | | | | | | | | | Remove code working around a Qt bug and a modification on a type entry name which was apparently intended to strip off qualifiers using a regex, but has no effect since the QString overload was called. Remove check for null in AbstractMetaBuilderPrivate::addAbstractMetaClass() and modify call sites accordingly. Change-Id: I7ab2a163fe558af09f2c7989bdec1561e9bbb203 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Warn about unimplemented attributesFriedemann Kleint2018-07-301-13/+107
| | | | | | | Task-number: PYSIDE-743 Change-Id: I7caddc5c84749911db3a550006ca9f9884b20958 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Add some number to the progress messagesFriedemann Kleint2018-07-301-5/+10
| | | | | | | | Show number of classes, etc. Change-Id: I2ca7a1b4eae09db7ea71e8843182f69df95b7c1c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Fix order of type indexesFriedemann Kleint2018-07-261-0/+17
| | | | | | | | | Sort the classes, enumerations and global functions alphabetically. Task-number: PYSIDE-757 Change-Id: I65fd7058fa5dff6f5724915b142d68bd18dba4c7 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Fix non-deterministic order of some SBK type indexesFriedemann Kleint2018-07-264-101/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change underlying type of the type database from a QHash<qualified_name, list of entries> to a QMultiMap<qualified_name, entry>. Previously, there was an allEntries() accessor and a function named entries() building a QHash<qualified_name, entry>. Simplify this so that there is only an entries() accessor returning the QMultiMap. Refactor the various Typedatabase::find() functions to operate on an iterator range of the QMultiMap. This unearthed some bugs: 1) In the generators, the call to findType(packageName()) would return the namespace entry for "sample" instead of the intended module type entry named "sample" due to the ordering. Add a new function to search for module type entries and assert that it finds it. 2) There was a duplicate, empty primitive type entry for QModelIndexList. Task-number: PYSIDE-757 Change-Id: I1814e4ca67d306e1488398507707cfd07b3f2c78 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Add support for type aliases (using)Friedemann Kleint2018-07-263-10/+56
| | | | | | | | | | | | | | | QAbstractRayCaster is the first class in Qt to use type aliases: using Hits = QVector<QRayCasterHit>; Treat them as typedefs if a canonical type can be obtained for them. This requires adding some simplification of the canonical types obtained for standard containers. Task-number: PYSIDE-751 Change-Id: I521a8b02d3c8cb89e4f72a817fbacc5955041570 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* shiboken: Fix the allow-thread attribute to actually have an effectFriedemann Kleint2018-07-258-20/+159
| | | | | | | | | | | | | | | | Previously, calls to BEGIN_ALLOW_THREADS/END_ALLOW_THREADS were always generated since the value of XML attribute was not used. Fix it to actually use the value. Since having it default to "no" caused a number of deadlocks (related to thread functions or functions calling a virtual function (potentially reimplemented in Python), introduce "auto" as default value. "auto" turns off BEGIN_ALLOW_THREADS/END_ALLOW_THREADS for simple getter functions. Task-number: PYSIDE-743 Change-Id: I4833afef14f2552c75b3424417c2702ce25cb379 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
* shiboken: Add debug output for container typesFriedemann Kleint2018-07-242-0/+9
| | | | | Change-Id: Ied74ec8ca7e3b3c439204c5010b0b727be3b13b2 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* shiboken: Add exception specification to clang parserFriedemann Kleint2018-07-246-0/+35
| | | | | | | | | For exception handling, calls into C++ might need to wrapped in try/catch. Detect noexcept functions for which this can be omitted. Task-number: PYSIDE-62 Change-Id: I37aced91ace184edf211a457a60c131d516a4037 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-07-241-1/+0
|\ | | | | | | Change-Id: Ie90b31ed1b88f1353261fc4040db2d788df279e6
| * shiboken: Remove -fno-exceptions from Clang parse optionsFriedemann Kleint2018-07-231-1/+0
| | | | | | | | | | | | | | | | | | The option is a workaround for an old LLVM bug and is no longer needed. Worse, it causes parse errors in code that declares throw(). Task-number: PYSIDE-62 Change-Id: Ib72b14cc704c04ae3b4197fd2af718276e3fe788 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Fix invalid QStringRefs in type parserFriedemann Kleint2018-07-241-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | The QStringRefs returned by QXmlStreamAttribute do not point to some XML buffer but into a string within QXmlStreamAttribute itself and thus become invalid when the attribute is removed from the list. Store them in a QString instead. Amends e0e44f0fd5b05ee299bd4e377b0d4a302c442aae. Task-number: PYSIDE-743 Change-Id: I841eb70379af8e006868c6352283bf2970dd127d Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Fix some clang-tidy warnings in shibokenFriedemann Kleint2018-07-2314-158/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 'else if' after return/break/continue - Use const ref for complex arguments passed by value where possible - Fix 'if (foo) delete foo' to 'delete foo' - Use container.isEmpty() instead of container.size() in checks - Use ' = default' for trivial constructors/destructors - Use range based for where possible - Complete constructor initializer lists - Fix invocations of static methods - Replace some reinterpret_cast by static_cast - Remove unused variables/fields - Use initializer lists for return types Change-Id: Id5b44a2f9d429f66ef069d532a1cd31df796d38e Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Improve the XML error messagesFriedemann Kleint2018-07-231-4/+6
| | | | | | | | | | | | | | Use colons to separate name, line and column as compilers do. Change-Id: I43adf1c9f7ac50759777fbbd855faaa7f858f369 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Add options for diff and dry-runFriedemann Kleint2018-07-232-83/+76
| | | | | | | | | | | | | | | | | | Refactor and breathe life back into the existing diff/dry-run functionality of class FileOut and make it available via command line options. Change-Id: I32e1e262c0c2e8f107776923477fe9714ad295cf Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Add comparison to AbstractMetaTypeFriedemann Kleint2018-07-233-8/+29
| | | | | | | | | | | | | | | | | | | | | | Extend the existing rudimentary comparison function from the meta builder and provide comparison operators. This will be useful for later refactorings. Task-number: PYSIDE-672 Change-Id: I793656a733db676d9bc3ab8910869e50274f6a79 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Cache TypeInfo in clangbuilderFriedemann Kleint2018-07-233-6/+33
| | | | | | | | | | | | | | | | | | Add a cache containing the TypeInfo for the CXType structs. Task-number: PYSIDE-672 Change-Id: Ibd0b5bb3f01fa507a65ded8f121c12a10aa7c401 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Refactor attribute parsing in typesystem parserFriedemann Kleint2018-07-194-1178/+1681
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split up the 1400 lines Handler::startElement() function into smaller helper functions. Previously, the function populated a hash with the default values of all attributes. The values were then set by fetchAttributes() from the XML attributes and applied later on. In this setup, it is not possible to add deprecation warnings since it not possible to tell which attributes were actually present in the file. Change this to operate on the QXmlStreamAttributes list from which the consumed options are removed. Add a warning about unused attributes. It is now possible to add deprecation warnings and the default values are now more obvious. Task-number: PYSIDE-743 Change-Id: I1ee04e9490b3664bba4c976fe654183819610b58 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Refactor attribute enumeration lookups in parserFriedemann Kleint2018-07-195-262/+330
| | | | | | | | | | | | | | | | | | | | | | | | Replace the static QHashes in Handler::startElement() and other places which required converting and lower-casing the QStringRef's returned by the QXmlStreamReader by lookup functions that take a QStringView, which can be constructed from QString or QStringRef. Task-number: PYSIDE-743 Change-Id: I10234f2ddfff13ee7e0ee67f9aee118a088e5ab8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Document the smart-pointer-typeFriedemann Kleint2018-07-171-0/+20
| | | | | | | | | | | | Task-number: PYSIDE-363 Change-Id: Ib07430cb26676a47e6de1453c10b080719f7ed7d Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken/ApiExtractor tests: Handle parse failuresFriedemann Kleint2018-07-171-1/+2
| | | | | | | | | | | | | | | | Pass up the bool return. Task-number: PYSIDE-743 Change-Id: Ic63a33be4c20a225d9f6a2e8a750e0e90bdce358 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Improve debug output of TypeEntry classesFriedemann Kleint2018-07-162-20/+92
| | | | | | | | | | | | Task-number: PYSIDE-743 Change-Id: Ie4794c6387ef5ffaf8a5813b744fa725427b5f09 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | ApiExtractor manual: Remove deprecated sphinx config key html_use_smartypantsFriedemann Kleint2018-07-131-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes warnings: WARNING: html_use_smartypants option is deprecated. Smart quotes are on by default; if you want to disable them, use the smartquotes option. Amends 32a2eb95758f7beb13b54053bfa97c9bc973b9f0. Task-number: PYSIDE-363 Change-Id: I0a4a8578aacbeca1fba08cffd54adfeac6022f21 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Make revision and SBK index a member of TypeEntryFriedemann Kleint2018-07-135-45/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They were previously stored in a global hash, apparently due to BC issues. Replace the global set/getTypeIndex/Revision functions by member functions of TypeEntry in typedatabase.cpp. As a drive-by change, simplify the code assigning the SBK numbers to use a flat list of entries ordered by revision and name instead of a grouped hash (bearing in mind that revision is rarely used) and might be removed one day). Also replace the use of std::unique() by the !contains()/append() pattern since std::unique() assumes an ordered list which is likely not the case. Task-number: PYSIDE-725 Task-number: PYSIDE-743 Change-Id: I9356acf1f5795446c08f266c1323f1db65cd490c Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Remove global-static hashes used for members of TypeEntryFriedemann Kleint2018-07-132-27/+11
| | | | | | | | | | | | | | | | | | | | | | TypeEntry::customConversion and ComplexTypeEntry::defaultConstructor where previously stored in global-static hashes, apparently due to BC issues. This can now be fixed. Task-number: PYSIDE-725 Task-number: PYSIDE-743 Change-Id: If4f28246a5b83e3772021a518058a9d152bb3e3f Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Make targetLangPackage() a normal property of TypeEntryFriedemann Kleint2018-07-132-58/+4
| | | | | | | | | | | | | | | | | | | | Normally, only the root typesystem element has a package specification; there is no need to have virtual functions for it. Task-number: PYSIDE-725 Task-number: PYSIDE-743 Change-Id: I3b86c8418cf16ce372c1953279a115e2eff0e984 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Remove unused TypeEntry classesFriedemann Kleint2018-07-132-128/+0
| | | | | | | | | | | | | | Task-number: PYSIDE-725 Task-number: PYSIDE-743 Change-Id: I61fcd8af7329c14ef064795c13787005b4375548 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-07-131-7/+66
|\| | | | | | | Change-Id: I85c005419736d5abf65077ff259509610853af4e
| * shiboken: Provide g++ internal headers for CentOS, tooFriedemann Kleint2018-07-101-7/+32
| | | | | | | | | | | | | | | | | | Extend the check introduced by 4725008aeea407ae55cfd66de802dd9e06412efc to CentOS. Task-number: PYSIDE-733 Change-Id: Iaaf2b8af0fa03684d4a3cbd5c5e70e141d125139 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * Fix macOS build when building inside Homebrew environmentAlexandru Croitor2018-07-091-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A brew build environment sets up a clang shim (fake clang ruby script that sets up additional compiler flags), which passes all brew formula dependency include paths as system include paths (via -isystem). This also includes the Qt dependency. Because our clang parser currently ignores system headers (see Builder::visitLocation in clangbuilder.cpp) and because Qt include statements inside header files would resolve to the system header location, this would result in no Qt classes being recognized by the API extractor, and thus fail the build. Fix this by checking for an environment variable that brew sets inside its build environment, to filter out the unnecessary -isystem flags. This way the Qt include path would be passed as a non-system include path from CMake, and thus correctly complete the build. Task-number: PYSIDE-731 Change-Id: I9b543eddc85270f1e8a90d9f30194b2a862e80d7 Reviewed-by: Christian Tismer <tismer@stackless.com> Reviewed-by: Alberto Sottile <alby128@gmail.com>
* | shiboken: Fix Clang warningsFriedemann Kleint2018-07-121-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | - Add Q_FALLTHROUGH() - Fix warnings about passing messages as format to qFatal() - Fix warnings about old-style casts - Fix warnings about comma operator - Fix warning about unreachable return Change-Id: Iaf31259c0f8156204f4d10ee0e594b89abbba5d3 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Do not swallow XML parsing errorsFriedemann Kleint2018-07-123-7/+7
| | | | | | | | | | | | | | | | | | | | Handler::parseFile() had some returns where the errors would be lost. Add accessor for the errorString() to the Handler and output in the calling function. Task-number: PYSIDE-743 Change-Id: I42d2b88478e8ebfac7f590c2086046116e2add74 Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Move detection of template arguments to ClangBuilderFriedemann Kleint2018-07-116-16/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Obtain the template arguments from Clang and fall back to parsing the type name where this is not possible (which may be the case inside a template declaration). The string-based formatting and re-parsing of the type in AbstractMetaBuilder::translateType() can then be removed, opening the way to passing up more complex types from Clang into the MetaBuilder. Task-number: PYSIDE-672 Change-Id: I43ff285c5f3720319bf40c65b1c27302ef1b934e Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Improve const handlingFriedemann Kleint2018-07-114-75/+82
| | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use new enum in code. - Rewrite the Clang type parsing to make use of it. - Adapt some typesystem files. This enables the distinction between "int *" and "int *const" and fixes the signatures from "int const &" to the more common "const int&". Task-number: PYSIDE-672 Change-Id: Ic1bff0015188c32f53d0e6f347b1523254cb7e4f Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Improve support for volatileFriedemann Kleint2018-07-114-8/+42
| | | | | | | | | | | | | | | | | | | | | | Previously, the volatile keyword ended up as a part of the qualified type name while parsing in translateType(). Add the token to TypeParser and add it to AbstractMetaType. Task-number: PYSIDE-672 Change-Id: I553ea1b35e7e99ffde4442471b82e32be84731ba Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Introduce enumeration for C++ indirectionsFriedemann Kleint2018-07-117-33/+73
| | | | | | | | | | | | | | | | | | | | | | Replace the int "indirections" field of TypeInfo and AbstractMetaType by a Vector of an enumeration representing '*' and "* const". It is then possible distinguish between "int *" and "int *const". Task-number: PYSIDE-672 Change-Id: I68677fa515abb7e94217fc1c2b6ac28b42678284 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Add a test for typeinfo parsingFriedemann Kleint2018-07-112-0/+27
| | | | | | | | | | | | | | Task-number: PYSIDE-672 Change-Id: I6fad16453f20f16e264eba33493c86160505812c Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Improve error messages when rejecting functionsFriedemann Kleint2018-07-111-28/+12
| | | | | | | | | | | | | | | | | | | | | | Pass up errors from translateType() to traverseFunction(). Remove the check for void type parameters since that is not needed any more after 50dd4ae202d7afb3556335c056db003f5ef50532. Task-number: PYSIDE-672 Change-Id: I82c095f027196361200b8854139b4bbc1fcc38c8 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | shiboken: Streamline type parsingFriedemann Kleint2018-07-113-22/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a static AbstractMetaType *AbstractMetaBuilder::translateType() method from the existing AbstractMetaBuilderPrivate::translateType() which can be passed the current class. Internally, add a AbstractMetaBuilderPrivate::translateTypeStatic() method that takes AbstractMetaBuilderPrivate parameter. Use that in conjunction with the TypeParse code to remove the type parsing code in ShibokenGenerator::buildAbstractMetaTypeFromString(). Task-number: PYSIDE-672 Change-Id: Ia17f0eb542099dcb843a59708110fc9d90fab12f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | shiboken: Add instantiations to TypeInfoFriedemann Kleint2018-07-114-27/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When streamlining the typeinfo structs in 7f798dfc9fc6e3e9756f06f0fedc821e16f1320a, the parser was wrongly changed to use TypeInfo::m_arguments for template instantiations. This field is intented for function pointer arguments (which the parser does not support). Add a new TypeInfo::m_instantiations (matching AbstractMetaType::m_instantiations) for templates, support it in the type parser and to the toString() method. This allows to remove the mysterious TypeInfo::instantiationName() method. Task-number: PYSIDE-672 Change-Id: I705b26d65988ebfb837e8323941076b4fb37d120 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io> Reviewed-by: Christian Tismer <tismer@stackless.com>
* | Merge "Merge remote-tracking branch 'origin/5.11' into dev" into ↵Friedemann Kleint2018-07-064-2/+50
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/5.11' into devFriedemann Kleint2018-07-064-2/+50
| |\| | | | | | | | | | Change-Id: I52be54b4bd400df557255b7d88eb22cb7260ca31
| | * shiboken: Fix handling of deleted functionsFriedemann Kleint2018-07-064-1/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check the cursor availability to detect deleted functions. This fixes the build of the Qt 5.12 API, which for the first time has a Q_DISABLE(QCBorStreamReader) in a public section, causing a copy constructor to be reported. Task-number: PYSIDE-487 Change-Id: I31ba0103cf612a4238c0e282ffcfeeab29df97d1 Reviewed-by: Christian Tismer <tismer@stackless.com>
| | * shiboken: Handle enum class forward declarationsFriedemann Kleint2018-07-062-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the enumeration to the scope stack only if it actually has values. This occurs for the first time in Qt 5.12, which introduces a forward declaration of enum class QCborSimpleType at src/corelib/kernel/qmetatype.h:65. Task-number: PYSIDE-487 Change-Id: I5798eb8e47bcd4d21dc554dc5cdd257c7163ca90 Reviewed-by: Christian Tismer <tismer@stackless.com>