diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:21:42 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2013-09-20 08:29:17 +0200 |
| commit | bbb78a92a910d32b2886af62c218db87325eb6ce (patch) | |
| tree | 0e4b55352bb9f083826d0e80747982823f2894ed /src/qml/qml/qml.pri | |
| parent | 4b5a7b15fc6d3650c8e9b7bf619804a0a953eeba (diff) | |
| parent | 8ed38c70fd29680f7981d9d23581d46cf32139d0 (diff) | |
Merge branch 'dev' of ssh://codereview.qt-project.org/qt/qtdeclarative into HEAD
Conflicts:
src/qml/compiler/qv4isel_masm.cpp
src/qml/jsruntime/qv4script.cpp
src/qml/qml/qml.pri
src/qml/qml/qqmltypeloader_p.h
Change-Id: Ia784d855a2131e3289454f12d841ca2c65be15c1
Diffstat (limited to 'src/qml/qml/qml.pri')
| -rw-r--r-- | src/qml/qml/qml.pri | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri index 77b0334c7e..3bba6f8e83 100644 --- a/src/qml/qml/qml.pri +++ b/src/qml/qml/qml.pri @@ -55,6 +55,7 @@ SOURCES += \ $$PWD/qqmlcontextwrapper.cpp \ $$PWD/qqmlvaluetypewrapper.cpp \ $$PWD/qqmltypewrapper.cpp \ + $$PWD/qqmlfileselector.cpp \ $$PWD/qqmlobjectcreator.cpp HEADERS += \ @@ -125,13 +126,15 @@ HEADERS += \ $$PWD/qqmlplatform_p.h \ $$PWD/qqmlbinding_p.h \ $$PWD/qqmlextensionplugin_p.h \ - $$PWD/qqmlabstracturlinterceptor_p.h \ + $$PWD/qqmlabstracturlinterceptor.h \ $$PWD/qqmlapplicationengine_p.h \ $$PWD/qqmlapplicationengine.h \ $$PWD/qqmllistwrapper_p.h \ $$PWD/qqmlcontextwrapper_p.h \ $$PWD/qqmlvaluetypewrapper_p.h \ $$PWD/qqmltypewrapper_p.h \ + $$PWD/qqmlfileselector_p.h \ + $$PWD/qqmlfileselector.h \ $$PWD/qqmlobjectcreator_p.h include(ftw/ftw.pri) |