diff options
| author | Kevin Wright <kevin.wright@nokia.com> | 2011-11-24 15:24:00 (GMT) |
|---|---|---|
| committer | Kevin Wright <kevin.wright@nokia.com> | 2011-11-24 15:24:00 (GMT) |
| commit | 0272b55b500d02ae64637635dfd33308a2a700e7 (patch) | |
| tree | ada21b69cc5672b469a25d8931f98b82827d8c7e | |
| parent | 39419950a331e406b00a67ca6816b1e4ac3b15f8 (diff) | |
| parent | 5a935c8d2015f3dba5f4a9db0f7040b067dc00b3 (diff) | |
| download | Qt-0272b55b500d02ae64637635dfd33308a2a700e7.zip Qt-0272b55b500d02ae64637635dfd33308a2a700e7.tar.gz Qt-0272b55b500d02ae64637635dfd33308a2a700e7.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging
| -rw-r--r-- | doc/doc.pri | 8 | ||||
| -rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro | 1 | ||||
| -rw-r--r-- | examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc | 6 |
3 files changed, 4 insertions, 11 deletions
diff --git a/doc/doc.pri b/doc/doc.pri index 2480b07..c51a621 100644 --- a/doc/doc.pri +++ b/doc/doc.pri @@ -30,10 +30,10 @@ $$unixstyle { COPYWEBKITGUIDE = $$replace(COPYWEBKITGUIDE, "/", "\\") COPYWEBKITTARGA = $$replace(COPYWEBKITTARGA, "/", "\\") COPYWEBKITTARGB = $$replace(COPYWEBKITTARGB, "/", "\\") - EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\")) - DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\")) - EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\")) - DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\")) + EXAMPLESMANIFEST = $$replace(EXAMPLESMANIFEST, "/", "\\") + DEMOSMANIFEST = $$replace(DEMOSMANIFEST, "/", "\\") + EXAMPLESMANIFESTTARGET = $$replace(EXAMPLESMANIFESTTARGET, "/", "\\") + DEMOSMANIFESTTARGET = $$replace(DEMOSMANIFESTTARGET, "/", "\\") } ADP_DOCS_QDOCCONF_FILE = qt-build-docs-online.qdocconf QT_DOCUMENTATION = ($$QDOC qt-api-only.qdocconf assistant.qdocconf designer.qdocconf \ diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro index 3864dfc..c751b2c 100644 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro +++ b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.pro @@ -32,7 +32,6 @@ symbian:TARGET.CAPABILITY += NetworkServices # The .cpp file which was generated for your project. Feel free to hack it. SOURCES = main.cpp model.cpp HEADERS = model.h -RESOURCES += abstractitemmodel.qrc # Please do not modify the following two lines. Required for deployment. desktopInstallPrefix=$$[QT_INSTALL_EXAMPLES]/declarative/modelviews/abstractitemmodel diff --git a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc b/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc deleted file mode 100644 index 4ae861c..0000000 --- a/examples/declarative/modelviews/abstractitemmodel/abstractitemmodel.qrc +++ /dev/null @@ -1,6 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>view.qml</file> -</qresource> -</RCC> - |