Skip to content

Commit

Permalink
Merge branch '10-bugfix_moc_running_on_nonqobject_headers' into 'master'
Browse files Browse the repository at this point in the history
MOC running on non-QObject headers

Closes podsvirov#10

See merge request energid/osgqtquick!9
  • Loading branch information
Piyoosh Mukhija committed May 3, 2018
2 parents 5ee57b0 + d844de5 commit 22a7728
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions src/qml/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,10 @@ set(_hdrs
osg/drawable.hpp
osg/shapedrawable.hpp
osg/graphicscontext.hpp
osg/lightindex.hpp
osg/lightsourceindex.hpp
osg/lightmodelindex.hpp
osg/stateattributeindex.hpp
osg/osgqtconversion.hpp
osg/light.hpp
osg/lightsource.hpp
osg/lightmodel.hpp
osg/stateattribute.hpp

osgdb/loader.hpp
osgdb/loaderindex.hpp
Expand All @@ -134,9 +133,13 @@ list(APPEND _srcs
osg/shapedrawable.cpp
osg/graphicscontext.cpp
osg/module.cpp
osg/light.cpp
osg/lightindex.cpp
osg/lightsource.cpp
osg/lightsourceindex.cpp
osg/lightmodel.cpp
osg/lightmodelindex.cpp
osg/stateattribute.cpp
osg/stateattributeindex.cpp
osg/osgqtconversion.cpp
# osgDB
Expand Down

0 comments on commit 22a7728

Please sign in to comment.