diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-03 13:20:01 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-05-03 13:20:12 +0300 |
| commit | 32223bddfe63a91ef8b2f1d1b2b82b2d12ce4a7b (patch) | |
| tree | 73cf1768546026713a349ff588c7976f040d2c0d /src/Authoring/Studio/Qt3DStudio.pro | |
| parent | 5f8acf1bb4c1c8df100a547efd84a709a276a848 (diff) | |
| parent | 310dfc983505c1d558d535c42b0c66963a5736c2 (diff) | |
Merge remote-tracking branch 'origin/master' into wip/timeline
Change-Id: Ifbb90bc53b80e50a7015ed5862814f214cd95bea
Diffstat (limited to 'src/Authoring/Studio/Qt3DStudio.pro')
| -rw-r--r-- | src/Authoring/Studio/Qt3DStudio.pro | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro index bb412bf8..1a5ce1b6 100644 --- a/src/Authoring/Studio/Qt3DStudio.pro +++ b/src/Authoring/Studio/Qt3DStudio.pro @@ -190,7 +190,11 @@ HEADERS += \ Palettes/TimelineGraphicsView/ui/RowTimelineContextMenu.h \ Palettes/TimelineGraphicsView/ui/NavigationBar.h \ Palettes/TimelineGraphicsView/ui/NavigationBarItem.h \ - Palettes/TimelineGraphicsView/ui/RowTimelinePropertyGraph.h + Palettes/TimelineGraphicsView/ui/RowTimelinePropertyGraph.h \ + Application/DataInputSelectModel.h \ + Application/DataInputSelectView.h \ + Render/StudioGradientWidget.h \ + Render/StudioVisualAidWidget.h FORMS += \ Application/TimeEditDlg.ui \ @@ -372,6 +376,7 @@ SOURCES += \ Render/StudioTranslationWidget.cpp \ Render/StudioWidget.cpp \ Render/StudioGradientWidget.cpp \ + Render/StudioVisualAidWidget.cpp \ Render/WGLRenderContext.cpp \ Utils/ImportUtils.cpp \ Utils/ResourceCache.cpp \ |