diff options
author | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
---|---|---|
committer | Alan Alpert <alan.alpert@nokia.com> | 2009-10-28 08:26:20 (GMT) |
commit | 07e1b6615e868af6434bb8e42dc2d44a51075204 (patch) | |
tree | 5bc94729576e561eae6bb9470dda0ab61b439f18 /tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro | |
parent | 1d14bbef27945d7823e9c32745e51d187093f1b7 (diff) | |
parent | 30d8810bfab9c8157f80e5e38beda1ad8c0acfb0 (diff) | |
download | Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.zip Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.gz Qt-07e1b6615e868af6434bb8e42dc2d44a51075204.tar.bz2 |
Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
Conflicts:
doc/src/declarative/globalobject.qdoc
Diffstat (limited to 'tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro')
-rw-r--r-- | tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro b/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro index af67373..542c14e 100644 --- a/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro +++ b/tests/auto/declarative/qmlmetaproperty/qmlmetaproperty.pro @@ -1,3 +1,5 @@ load(qttest_p4) contains(QT_CONFIG,declarative): QT += declarative +macx:CONFIG -= app_bundle + SOURCES += tst_qmlmetaproperty.cpp |