diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2011-06-07 10:15:38 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2011-06-07 10:15:38 +1000 |
| commit | 26942a682c82bd347da65b143442d53d58533263 (patch) | |
| tree | cb051af61f43d609a02c8894d2e0c6a3caff781b /src/declarative/qml/qml.pri | |
| parent | 6b54de600ce74025bc8ada20bea95ad183a6cd8d (diff) | |
| parent | fafe446dfe07606100d055395360513ed4eb4ecd (diff) | |
Merge branch 'master' into v8
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
src/declarative/qml/qdeclarativecontextscriptclass.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeglobalscriptclass.cpp
src/declarative/qml/qdeclarativeinclude.cpp
src/declarative/qml/qdeclarativelistscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass.cpp
src/declarative/qml/qdeclarativeobjectscriptclass_p.h
src/declarative/qml/qdeclarativetypenamescriptclass.cpp
src/declarative/qml/qdeclarativevaluetypescriptclass.cpp
Diffstat (limited to 'src/declarative/qml/qml.pri')
| -rw-r--r-- | src/declarative/qml/qml.pri | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/declarative/qml/qml.pri b/src/declarative/qml/qml.pri index 1baa21f3ae..cc2f362d4a 100644 --- a/src/declarative/qml/qml.pri +++ b/src/declarative/qml/qml.pri @@ -46,8 +46,7 @@ SOURCES += \ $$PWD/qdeclarativedirparser.cpp \ $$PWD/qdeclarativeextensionplugin.cpp \ $$PWD/qdeclarativeimport.cpp \ - $$PWD/qdeclarativelist.cpp \ - $$PWD/qperformancetimer.cpp \ + $$PWD/qdeclarativelist.cpp \ $$PWD/qintrusivelist.cpp \ HEADERS += \ @@ -113,7 +112,6 @@ HEADERS += \ $$PWD/qdeclarativeextensioninterface.h \ $$PWD/qdeclarativeimport_p.h \ $$PWD/qdeclarativeextensionplugin.h \ - $$PWD/qperformancetimer_p.h \ $$PWD/qintrusivelist_p.h \ QT += sql |