diff options
| author | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:49:21 +0200 |
|---|---|---|
| committer | Johanna Aijala <johanna.aijala@digia.com> | 2013-02-21 09:50:15 +0200 |
| commit | 862f941bdc02f104e3aecc756a003f1c1f9f5112 (patch) | |
| tree | 3ad5342cc2806d4dd51b88f26a9ff9e6eb30e63e /src/declarative/qml/qml.pri | |
| parent | 758349e729134061bb29583846826c47badb0472 (diff) | |
| parent | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (diff) | |
Merge branch 'stable' into release
Change-Id: Ib992a6e988e06887f7a4b3bc581514aa6a5b8886
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index cf2d7608..ea824031 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -53,8 +53,7 @@ SOURCES += \ $$PWD/qdeclarativedirparser.cpp \ $$PWD/qdeclarativeextensionplugin.cpp \ $$PWD/qdeclarativeimport.cpp \ - $$PWD/qdeclarativelist.cpp \ - $$PWD/qperformancetimer.cpp + $$PWD/qdeclarativelist.cpp HEADERS += \ $$PWD/qdeclarativeparser_p.h \ @@ -126,8 +125,7 @@ HEADERS += \ $$PWD/qdeclarativedirparser_p.h \ $$PWD/qdeclarativeextensioninterface.h \ $$PWD/qdeclarativeimport_p.h \ - $$PWD/qdeclarativeextensionplugin.h \ - $$PWD/qperformancetimer_p.h + $$PWD/qdeclarativeextensionplugin.h QT += sql network include(parser/parser.pri) |