diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:46 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-29 14:17:46 +0200 |
| commit | 7224dd977163335d61ed4297341e6161bf1dbcf7 (patch) | |
| tree | 1674bfdd872ba45908437c9cbc67ba98f5f3b534 /src/quick/scenegraph/scenegraph.pri | |
| parent | c704226b6815df4d989142729bae9fadd14f6f9d (diff) | |
| parent | f3973cbd077d2d92250958f8bda57fea30827f00 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I35f07a1725af104952f822274763dd7a96a9d560
Diffstat (limited to 'src/quick/scenegraph/scenegraph.pri')
| -rw-r--r-- | src/quick/scenegraph/scenegraph.pri | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/quick/scenegraph/scenegraph.pri b/src/quick/scenegraph/scenegraph.pri index ebf886dace..34432ffd9c 100644 --- a/src/quick/scenegraph/scenegraph.pri +++ b/src/quick/scenegraph/scenegraph.pri @@ -52,7 +52,6 @@ SOURCES += \ $$PWD/util/qsgpainternode.cpp \ $$PWD/util/qsgdistancefieldutil.cpp - # QML / Adaptations API HEADERS += \ $$PWD/qsgadaptationlayer_p.h \ @@ -68,8 +67,8 @@ HEADERS += \ $$PWD/qsgflashnode_p.h \ $$PWD/qsgshareddistancefieldglyphcache_p.h \ $$PWD/qsgrenderloop_p.h \ - $$PWD/qsgthreadedrenderloop_p.h - + $$PWD/qsgthreadedrenderloop_p.h \ + $$PWD/qsgwindowsrenderloop_p.h SOURCES += \ $$PWD/qsgadaptationlayer.cpp \ @@ -85,12 +84,5 @@ SOURCES += \ $$PWD/qsgflashnode.cpp \ $$PWD/qsgshareddistancefieldglyphcache.cpp \ $$PWD/qsgrenderloop.cpp \ - $$PWD/qsgthreadedrenderloop.cpp - - - - - - - - + $$PWD/qsgthreadedrenderloop.cpp \ + $$PWD/qsgwindowsrenderloop.cpp |