diff options
| author | Andrew Stanley-Jones <andrew.stanley-jones@nokia.com> | 2011-10-19 09:39:46 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-19 01:48:10 +0200 |
| commit | b7b23d0df3ad8a25d4f68321ed36d5c5d9bbcb9c (patch) | |
| tree | 04f9333a9f6198560b1dee854ecd49e00babcded /examples | |
| parent | 961499b3140c51f92cf6cdbe2db94fe05e912d44 (diff) | |
Fixup jsondb forcing options for examples and tests
Change-Id: Iea0f794da326b14c73fff7f5fb44abe1f08b9fb6
Reviewed-by: Andrew Stanley-Jones <andrew.stanley-jones@nokia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/serviceframework/dialer/dialer.pro | 10 | ||||
| -rw-r--r-- | examples/serviceframework/remotedialerservice/remotedialerservice.pro | 2 |
2 files changed, 8 insertions, 4 deletions
diff --git a/examples/serviceframework/dialer/dialer.pro b/examples/serviceframework/dialer/dialer.pro index 4c5bbea7..6e8e3fb5 100644 --- a/examples/serviceframework/dialer/dialer.pro +++ b/examples/serviceframework/dialer/dialer.pro @@ -10,14 +10,18 @@ OTHER_FILES += \ content/DialButton.qml \ content/DialScreen.qml \ content/DialerList.qml \ -dialer.qml +content/qmldir \ +content/call.png \ +content/hangup.png \ +dialer.qml \ +icon.png # install target.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dialer.pro +sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS $$OTHER_FILES dialer.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer -contains(config_test_jsondb, yes) { +jsondb|contains(config_test_jsondb, yes) { info.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/dialer info.files = info.json } diff --git a/examples/serviceframework/remotedialerservice/remotedialerservice.pro b/examples/serviceframework/remotedialerservice/remotedialerservice.pro index e0e3c473..d16d9ebf 100644 --- a/examples/serviceframework/remotedialerservice/remotedialerservice.pro +++ b/examples/serviceframework/remotedialerservice/remotedialerservice.pro @@ -14,7 +14,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS remotedialerservice.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/remotedialerservice xml.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/xmldata xml.files = remotedialerservice.xml -contains(config_test_jsondb, yes) { +jsondb|contains(config_test_jsondb, yes) { info.path = $$[QT_INSTALL_EXAMPLES]/qtsystems/serviceframework/remotedialerservice info.files = info.json interfaces.json } |