aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/qml/qqmlimport.cpp
Commit message (Expand)AuthorAgeFilesLines
* wasm: rename Q_OS_HTML5 to Q_OS_WASM to reflect qtbasewip/webassemblyLorn Potter2018-07-181-1/+1
* wasm: cleanup code, remove obsolete codeLorn Potter2018-06-071-0/+1
* Merge remote-tracking branch 'origin/5.11.0' into wip/webassemblyMorten Johan Sørvig2018-05-111-31/+31
|\
| * Fix crash when calling QQmlEngine::clearComponentCache()Simon Hausmann2018-03-191-31/+31
* | Merge remote-tracking branch 'gerrit/5.11' into wip/webassemblyMorten Johan Sørvig2018-03-081-88/+131
|\|
| * use nullptr consistently (clang-tidy)Shawn Rutledge2018-02-261-12/+12
| * Merge remote-tracking branch 'origin/5.10' into 5.11Liang Qi2018-02-121-66/+84
| |\
| | * Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-02-021-66/+84
| | |\
| | | * Fix dead lock / race in QML type loader when importing pluginsSimon Hausmann2018-02-021-66/+84
| * | | doc: Fix qdoc warnings for templates and staticsMartin Smith2018-02-091-3/+3
| |/ /
| * | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2018-01-041-4/+27
| |\|
| | * Don't reject plugin-only qmldir filesUlf Hermann2017-11-221-2/+2
| | * Fix URL interception for qmldir filesUlf Hermann2017-11-221-2/+25
| * | Fix QQmlImportsPrivate::resolvedUri()v5.10.0-rc3v5.10.0J-P Nurmi2017-11-301-4/+6
| * | Check for duplication with url rather than uriMichael Brasser2017-11-081-1/+1
* | | wasm: get declarative building and running for webassemblyLorn Potter2018-01-041-4/+9
|/ /
* | Merge remote-tracking branch 'origin/5.9' into 5.10Liang Qi2017-10-241-19/+42
|\|
| * Tell QQmlImportInstance::resolveType what kind of type we wantUlf Hermann2017-10-191-16/+37
* | Fix implicit loading of internal types when using explicit importsSimon Hausmann2017-09-261-2/+6
* | Merge remote-tracking branch 'origin/5.9' into 5.10Lars Knoll2017-09-201-0/+11
|\|
| * Fix qml cache invalidation when changing dependent C++ registered QML singletonsSimon Hausmann2017-09-121-0/+11
* | Use the qEnvironmentVariable function from QtCoreThiago Macieira2017-09-141-2/+2
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-08-181-30/+33
|\|
| * Fix void * usage in our internal APIsLars Knoll2017-08-021-1/+2
| * Remove unused types on engine destructionSimon Hausmann2017-08-021-2/+2
| * Use QQmlType by valueLars Knoll2017-08-021-27/+29
* | Merge remote-tracking branch 'origin/5.9' into devSimon Hausmann2017-07-281-2/+2
|\|
| * Fix loading of QML plugins with old IID in static buildsSimon Hausmann2017-07-261-2/+2
* | Add support for enum declarations in QMLMichael Brasser2017-07-131-10/+26
|/
* Allow import static plugins even when library feature is disabledKimmo Ollila2017-03-031-34/+5
* QQmlImportDatabase: Fix static build with clangRobert Loehning2017-01-311-0/+2
* Enable resolution of composite types in QQmlTypeNameCacheRobin Burchell2017-01-271-4/+6
* QQmlImport: Decouple QQmlImportNamespace & Import type from qqmlimport.cppRobin Burchell2017-01-261-69/+34
* Un-nest QQmlTypeLoader::QmldirContentRobin Burchell2017-01-261-11/+11
* QQmlImport: Document some methods used by QQmlTypeLoaderRobin Burchell2017-01-261-0/+16
* QQmlImport: Document populateCache methodRobin Burchell2017-01-261-0/+11
* Slight improvements to resolveType for the common caseRobin Burchell2017-01-251-9/+13
* QQmlImport: Add a little documentation for QQmlImportNamespace & ImportRobin Burchell2017-01-251-7/+39
* QQmlImport: Clean up & rename getTypeForUrl to fetchOrCreateTypeForUrlRobin Burchell2017-01-251-34/+66
* Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-12-141-7/+7
|\
| * Get rid of most QT_NO_FOO usagesLars Knoll2016-11-291-7/+7
* | QQmlImportsPrivate: remove homebrew 'greaterThan'Anton Kudryavtsev2016-10-271-5/+2
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-09-211-15/+18
|\|
| * QML: Cleanup prefix/suffixes for plug-in resolvingErik Verbruggen2016-09-191-15/+18
* | Qml: replace 'foreach' with 'range for'Anton Kudryavtsev2016-09-201-13/+13
* | QQmlImportNamespace: mark findImport() method as constAnton Kudryavtsev2016-09-171-7/+6
* | QmlImports: Extract Method makePlugins()Anton Kudryavtsev2016-09-161-10/+16
|/
* Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-191-1/+1
|\
| * Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-181-1/+1
| |\
| | * Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-151-1/+1