| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Fix qmake.pro after Symbian alternate build system integration
Fix compile error
Don't try to use so much permissions, use something a lot more sane
A bit saner suggestion
Remove not needed permissions
Make compile on Symbian
|
| | | |
|
| | | |
|
| | |
| |
| |
| | |
QT-2695
|
| | |
| |
| |
| |
| |
| | |
Also, it's now Qml.app instead of qml.app. An icon is still missing.
Reviewed-by: con
|
| | | |
|
| |/
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
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
|
| | |
|
| |
|
|
| |
Task-number: QTBUG-9325
|
| |
|
|
| |
Reviewed-by: mae
|
| |
|
|
|
|
|
|
| |
Inline blocks/includes have been replaced with an import syntax:
import "foo.js" as Foo
this gives better separation between QML and code. Imported script blocks
also have a mandatory qualifier, which leads to better optimization
potential.
|
| | |
|
| | |
|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
src/declarative/util/qdeclarativelistmodel.cpp
tools/qml/qml.pro
|
| | |
| |
| |
| |
| | |
Similar to 032d4ac63687d209ffef594bf6ef60e3db20bfa3.
|
| | |
| |
| |
| | |
Was still using 'matchProperties' instead of just 'properties'.
|
| | | |
|
| | |
| |
| |
| | |
This commit removes the obsolete QML_REGISTER_TYPE macros.
|
| |\ \ |
|
| | |/ |
|
| |/ |
|
| |
|
|
|
|
| |
The is analog to the plugin system in Qt. It makes it possible
to ship an executable with extra plugins resp. qml import modules
without creating a qt.conf.
|
| |\ |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Where you would have written
x: NumberAnimation {}
y: Behavior {}
you now must write
NumberAnimation on x {}
Behavior on y {}
This change also makes the parser more strict with respect to multiple
assignments to a single property - they're no longer allowed. For example
this
x: 10
x: 11
is now an error.
|
| |/
|
|
|
|
| |
only use xmlpatterns if Qt is configured to build it
Reviewed-by: Paul Olav Tvete
|
| | |
|
| | |
|
| | |
|
|
|
QDeclarativeXXX.
|
