diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 19:45:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-09 19:45:31 (GMT) |
| commit | 25fd8c268acdcc9ab4918738040e7d70210bd686 (patch) | |
| tree | 26c75fc83b163c7e867392eb5a2cd03eff06e9fc /src/imports/qimportbase.pri | |
| parent | 80cbb6adaa134447469fde80076a8ec57ef00960 (diff) | |
| parent | 518a4668666f64a9ad996ac797bdaa676c54fd41 (diff) | |
| download | Qt-25fd8c268acdcc9ab4918738040e7d70210bd686.zip Qt-25fd8c268acdcc9ab4918738040e7d70210bd686.tar.gz Qt-25fd8c268acdcc9ab4918738040e7d70210bd686.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (29 commits)
Small optimization when checking if MouseArea's onPressAndHold is
Fix autotest.
Fixed `nmake clean' breaking declarative imports on Windows.
Fix drawing flicker on Qml Viewer startup
Fix snake demo
Add qmlmethod Item::childAt() to delarative item
Cursor positioning in QTextDocument after undo()
Fix slow network access in qmlviewer (Windows)
Don't layout multiple times when an ancestor becomes (in)visible.
Add an example of animated item add/remove in ListView
Add test for PropertyChanges with attached properties.
Make declarative autotests compile on Symbian abld build system
Accept enter key in the webbrower demo url input.
Keep reported point/pixel size in sync.
Remove unnecessary CloseSoftwareInputPanel events after TextEdit or TextInput has lost focus
Ensure state operations assigned to the default state are triggered
Add image example.
Fix regression in input panel autotests
Improve docs about Qml component case sensitivity.
Add some performance tips to QML docs.
...
Diffstat (limited to 'src/imports/qimportbase.pri')
| -rw-r--r-- | src/imports/qimportbase.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/imports/qimportbase.pri b/src/imports/qimportbase.pri index 91f6552..02364af 100644 --- a/src/imports/qimportbase.pri +++ b/src/imports/qimportbase.pri @@ -17,6 +17,8 @@ copy2build.output = $$QT_BUILD_TREE/imports/$$TARGETPATH/qmldir copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} copy2build.name = COPY ${QMAKE_FILE_IN} copy2build.CONFIG += no_link +# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir +copy2build.CONFIG += no_clean QMAKE_EXTRA_COMPILERS += copy2build TARGET = $$qtLibraryTarget($$TARGET) |