diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-27 19:32:08 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-04-27 19:32:08 (GMT) |
| commit | e0a2a4d343902e96e51df1fabeaaf543f4cd2a47 (patch) | |
| tree | 4cb1ab83e9881a403e2857882fb0d6383118a393 /examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro | |
| parent | f6f9777408691a945c49ef8ec5037d8401c747eb (diff) | |
| parent | a17339e943f21bb6c6e16884f716dd9ab8f94938 (diff) | |
| download | Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.zip Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.gz Qt-e0a2a4d343902e96e51df1fabeaaf543f4cd2a47.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Conflicts:
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-html-templates.qdocconf
tools/qdoc3/test/qt.qdocconf
Diffstat (limited to 'examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro')
| -rw-r--r-- | examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro new file mode 100644 index 0000000..bd05ebe --- /dev/null +++ b/examples/declarative/tutorials/extending/chapter3-bindings/chapter3-bindings.pro @@ -0,0 +1,5 @@ +QT += declarative + +HEADERS += musician.h +SOURCES += musician.cpp \ + main.cpp |