History

warning fixes

Anthony J. Thibault committed 9 years ago

Commit e4076e61 parent 47e87e11 file · +1 −2Browse files

Showing the changes to libraries/script-engine/src/TabletScriptingInterface.cpp (1 of 1 file). Show all

Unified · Split

libraries/script-engine/src/TabletScriptingInterface.cpp+1−2
@@ -170,7 +170,6 @@ QObject* TabletScriptingInterface::getFlags() · 169 unmodified lines
170static const char* TABLET_SOURCE_URL = "Tablet.qml";170static const char* TABLET_SOURCE_URL = "Tablet.qml";
171static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";171static const char* WEB_VIEW_SOURCE_URL = "TabletWebView.qml";
172static const char* VRMENU_SOURCE_URL = "TabletMenu.qml";172static const char* VRMENU_SOURCE_URL = "TabletMenu.qml";
173static int s_windowNameCounter = 1;
174 173
175class TabletRootWindow : public QmlWindowClass {174class TabletRootWindow : public QmlWindowClass {
176 virtual QString qmlSource() const { return "hifi/tablet/WindowRoot.qml"; }175 virtual QString qmlSource() const { return "hifi/tablet/WindowRoot.qml"; }
@@ -193,7 +192,7 @@ void TabletProxy::setToolbarMode(bool toolbarMode) { · 16 unmodified lines
193 192
194 // create new desktop window193 // create new desktop window
195 auto offscreenUi = DependencyManager::get<OffscreenUi>();194 auto offscreenUi = DependencyManager::get<OffscreenUi>();
196 offscreenUi->executeOnUiThread([=, this] {195 offscreenUi->executeOnUiThread([=] {
197 auto tabletRootWindow = new TabletRootWindow();196 auto tabletRootWindow = new TabletRootWindow();
198 tabletRootWindow->initQml(QVariantMap());197 tabletRootWindow->initQml(QVariantMap());
199 auto quickItem = tabletRootWindow->asQuickItem();198 auto quickItem = tabletRootWindow->asQuickItem();