diff options
| author | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-04-23 10:38:39 +0300 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2018-04-23 10:39:33 +0300 |
| commit | 058efbafa3e342e9a18c1897a85688c9644a7247 (patch) | |
| tree | e813edb51a90ed3527683558e3c9195d5cb37640 /src/Authoring/Studio/Qt3DStudio.pro | |
| parent | ca2c4d1993bf94b2707eb5ed1c3846737c2bbdd2 (diff) | |
| parent | 9d3f193509bf2c11273b264535e8dbcd22e92306 (diff) | |
Merge remote-tracking branch 'origin/master' into wip/timeline
Change-Id: I58176ea495831aee6eb35b9057bdecb6f3a6e1fe
Diffstat (limited to 'src/Authoring/Studio/Qt3DStudio.pro')
| -rw-r--r-- | src/Authoring/Studio/Qt3DStudio.pro | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/Authoring/Studio/Qt3DStudio.pro b/src/Authoring/Studio/Qt3DStudio.pro index b0c5df00..3260f502 100644 --- a/src/Authoring/Studio/Qt3DStudio.pro +++ b/src/Authoring/Studio/Qt3DStudio.pro @@ -2,6 +2,7 @@ TEMPLATE = app TARGET = Qt3DStudio include(../commoninclude.pri) include($$OUT_PWD/../qtAuthoring-config.pri) +include(../../shared/qtsingleapplication/qtsingleapplication.pri) INCLUDEPATH += $$OUT_PWD/.. CONFIG += nostrictstrings @@ -86,7 +87,6 @@ linux { STATICRUNTIME = \ $$BEGIN_ARCHIVE \ - -lLua$$qtPlatformTargetSuffix() \ -lEASTL$$qtPlatformTargetSuffix() \ -lpcre$$qtPlatformTargetSuffix() \ -lTinyXML$$qtPlatformTargetSuffix() \ @@ -144,6 +144,9 @@ HEADERS += \ Application/DataInputListDlg.h \ Application/DataInputSelectModel.h \ Application/DataInputSelectView.h \ + Application/DataInputSelectModel.h \ + Application/DataInputSelectView.h \ + Render/StudioGradientWidget.h \ Controls/ButtonControl.h \ Controls/ToggleButton.h \ Palettes/Timeline/IBreadCrumbProvider.h \ @@ -221,7 +224,6 @@ SOURCES += \ _Win/DragNDrop/DropProxy.cpp \ _Win/Palettes/PaletteManager.cpp \ _Win/Palettes/Progress/ProgressView.cpp \ - _Win/Palettes/Splash/SplashView.cpp \ _Win/UI/EditCameraBar.cpp \ _Win/UI/EditorPane.cpp \ _Win/UI/GLVersionDlg.cpp \ @@ -368,8 +370,8 @@ SOURCES += \ Render/StudioScaleWidget.cpp \ Render/StudioTranslationWidget.cpp \ Render/StudioWidget.cpp \ + Render/StudioGradientWidget.cpp \ Render/WGLRenderContext.cpp \ - Utils/CmdLineParser.cpp \ Utils/ImportUtils.cpp \ Utils/ResourceCache.cpp \ Utils/StudioUtils.cpp \ |