diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 07:59:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-14 07:59:52 (GMT) |
| commit | b70dd15c635990306bab35e440d7b561cac7c67e (patch) | |
| tree | b77966b6e81063257cff343bc61ba9c0dc4cb9b3 /tools | |
| parent | b915d0aa46599f707df4db6eb33965602a2d7422 (diff) | |
| parent | d9ab23c190de774ea093652060981e14ac5aeaf8 (diff) | |
| download | Qt-b70dd15c635990306bab35e440d7b561cac7c67e.zip Qt-b70dd15c635990306bab35e440d7b561cac7c67e.tar.gz Qt-b70dd15c635990306bab35e440d7b561cac7c67e.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:
Qt.include() support in worker scripts
Only add "include" property in non-workerscript threads
Missing files from 645b9ee9dd6e0576542cc61872ecedb408ca8a89
Reduce the chance of AnchorAnimation animating geometry changes it
Add Qt.include() method for scoped inclusion of JavaScript files
Fix crash in ParentAnimation.
Revert "Fix crash in ParentAnimation."
Symbian build fix to declarative auto and benchmark tests
Revert "Use raster graphicssystem for qml.app on OS X."
Fix crash in ParentAnimation.
Minor declarative webview tweaks
Removed dependency of QDeclarativeWebView to private Qt (Declarative) API
Note that you need to unset a flag to create a visual item
Follow-up on Flickable changes.
ListModel::get() should return undefined if bad index specified
Add an example spinner.
Fix crash on remote content.
Dates and variants are not considered nested objects
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qml/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qml/qml.pri | 6 | ||||
| -rw-r--r-- | tools/qml/qml.pro | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index 003716e..116ca71 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -184,7 +184,7 @@ int main(int argc, char ** argv) atexit(showWarnings); #endif -#if defined (Q_WS_X11) || defined(Q_WS_MAC) +#if defined (Q_WS_X11) //### default to using raster graphics backend for now bool gsSpecified = false; for (int i = 0; i < argc; ++i) { diff --git a/tools/qml/qml.pri b/tools/qml/qml.pri index d343c76..3c86d31 100644 --- a/tools/qml/qml.pri +++ b/tools/qml/qml.pri @@ -24,6 +24,12 @@ maemo5 { } else { SOURCES += $$PWD/deviceorientation.cpp } + +symbian { + INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ + LIBS += -lesock -lcommdb -lconnmon -linsock +} + FORMS = $$PWD/recopts.ui \ $$PWD/proxysettings.ui diff --git a/tools/qml/qml.pro b/tools/qml/qml.pro index b33d48b..77a9533 100644 --- a/tools/qml/qml.pro +++ b/tools/qml/qml.pro @@ -32,9 +32,7 @@ wince* { symbian { TARGET.UID3 = 0x20021317 include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) - INCLUDEPATH += $$QT_SOURCE_TREE/examples/network/qftp/ TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 - LIBS += -lesock -lcommdb -lconnmon -linsock TARGET.CAPABILITY = NetworkServices ReadUserData } mac { |