diff options
| author | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:22:39 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2009-11-27 03:22:39 (GMT) |
| commit | 4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3 (patch) | |
| tree | 3ce3662e9eb0b1c9a1f5d1e960954ce507fe144a /tools | |
| parent | e25e77c3d8bfd0f33aeea2484d714ade6a65a664 (diff) | |
| parent | 03e80ad9057ecc12a3e61e8a968e390023e5561d (diff) | |
| download | Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.zip Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.tar.gz Qt-4c78c5c0c2570f5052433f7abfb9d26eb1f2abe3.tar.bz2 | |
Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
examples/declarative/loader/qmlfolderlistmodel.h
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qmlviewer/qmlviewer.pro | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/qmlviewer/qmlviewer.pro b/tools/qmlviewer/qmlviewer.pro index 899a3ab..ed26d00 100644 --- a/tools/qmlviewer/qmlviewer.pro +++ b/tools/qmlviewer/qmlviewer.pro @@ -22,7 +22,8 @@ SOURCES += main.cpp \ qfxtester.cpp FORMS = recopts.ui \ proxysettings.ui -include($$QT_SOURCE_TREE/tools/shared/deviceskin/deviceskin.pri) +INCLUDEPATH += ../../include/QtDeclarative +include(../shared/deviceskin/deviceskin.pri) target.path = $$[QT_INSTALL_BINS] INSTALLS += target |