diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:19:33 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-17 18:20:05 +0100 |
| commit | 9338d4bd44787d9de16b097e2059c63e6d26eacd (patch) | |
| tree | d3a8b5952bd2bf4d17fe4c5d93daac91fdfc03d2 /src/declarative/qml/qml.pri | |
| parent | 3146dcbdc768c90a03b58eed3f42630604443093 (diff) | |
| parent | 0cd72c52ca5e5b21adbd47d0f551535e727b80ee (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I1175450886eca4dcaf7e81ae82fd112e541ad2f8
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) |