| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
| |
Reviewed-by: Trust Me
Requested-by: Legal
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
In shadow build environments, we cannot enforce that shared
library objects for plugins are located in the same directory
as the qmldir file. This makes it hard for Creator to support
mixed projects (qml/c++).
In order to gain more flexibility, the patch introduces a
pluginPathList to QDeclarativeEngine, which completes the existing
importsPathList.
The pluginPathList defaults to ["."], which indicates the directory
where the qmldir file is located in.
The qml viewer tool gains a command line option -P to add to the
pluginPathList.
For consistency, the -L option ("Library") has been renamed to
-I ("Import"). QDeclarativeEngine::importExtension() has been
renamed to QDeclarativeEngine::importPlugin().
The documentation has been adjusted accordingly.
Done with erikv.
Reviewed-by: erikv
|
| |
|
|
|
|
| |
Otherwise, simple things break, like having "image.qml" on a case-insensitive file system.
|
| |
|
| |
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
doc/src/declarative/examples.qdoc
doc/src/declarative/focus.qdoc
doc/src/declarative/modules.qdoc
doc/src/declarative/network.qdoc
doc/src/declarative/qdeclarativedebugging.qdoc
doc/src/declarative/qdeclarativei18n.qdoc
doc/src/declarative/qmlruntime.qdoc
doc/src/declarative/tutorial.qdoc
tests/auto/declarative/qdeclarativeimage/tst_qdeclarativeimage.cpp
|
| | |
|
|/
|
|
| |
Clean up structure and remove duplication.
|
| |
|
|
|
|
|
|
| |
This change removes the hacky final baseUrl+TypeName+".qml" lookup.
In order to still support internal files in remote modules, a new
qmldir keyword "internal" is introduced.
|
|
|
|
| |
QDeclarativeXXX.
|
| |
|
| |
|
|
|
|
| |
Reviewed-by: Trust Me
|
| |
|
|
|
|
| |
Task-number: QTBUG-7125
|
|
|
|
|
|
| |
QML_DEFINE_TYPE etc. now define just the initial support version, with
support in all future versions being thus implied.
QTBUG-5421
|
| |
|
| |
|
| |
|
|
|
|
|
|
|
|
|
|
|
| |
git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
src/declarative/qml/qmlscriptparser.cpp
src/declarative/qml/qmlscriptparser_p.h
Compiles, but probably next needs a revert/change of module stuff,
since that work seems to have been duplicated.
|
| |
|
| |
|
| |
|
|
|