Merge branch 'devel/master' into devel/new_vr

Change-Id: I628f6c90e6883f8773b0c6d840569a080789ea25

diff --cc adaptors/common/adaptor-impl.cpp
Simple merge

diff --cc adaptors/common/adaptor-impl.h
Simple merge

diff --cc adaptors/common/application-impl.cpp
index a1af2069b0ff967f985d9abd7387494f44ff0024,1be56ddd1d96d42f95949e7e3923d0f2f4602118..a37c630a2a244746cc0bca7428e82fecd4720840
mode 100644,100755..100755
--- 1/adaptors/common/application-impl.cpp
--- 2/adaptors/common/application-impl.cpp
+++ b/adaptors/common/application-impl.cpp
@@@ -176,25 -174,19 +174,25 @@@ void Application::DoInit(
    // Run the adaptor
    mAdaptor->Start();
  
-   // Check if user requires no vsyncing and set on X11 Adaptor
+   // Check if user requires no vsyncing and set Adaptor
 -  if (mCommandLineOptions->noVSyncOnRender)
 +  bool vsyncOnRender = true;
 +  if( mCommandLineOptions->noVSyncOnRender.set )
    {
-     vsyncOnRender = mCommandLineOptions->noVSyncOnRender.value;
 -    mAdaptor->SetUseHardwareVSync(false);
++    vsyncOnRender = !mCommandLineOptions->noVSyncOnRender.value;
    }
 +  mAdaptor->SetUseHardwareVSync( vsyncOnRender );
  
 -  Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( mCommandLineOptions->stereoBase );
 -  if( mCommandLineOptions->viewMode != 0 )
 +  if( mCommandLineOptions->stereoBase.set )
 +  {
 +    Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetStereoBase( mCommandLineOptions->stereoBase.value );
 +  }
 +
 +  if( mCommandLineOptions->viewMode.set )
    {
      ViewMode viewMode = MONO;
 -    if( mCommandLineOptions->viewMode <= STEREO_INTERLACED )
 +    if( mCommandLineOptions->viewMode.value <= STEREO_INTERLACED )
      {
 -      viewMode = static_cast<ViewMode>( mCommandLineOptions->viewMode );
 +      viewMode = static_cast<ViewMode>( mCommandLineOptions->viewMode.value );
      }
      Internal::Adaptor::Adaptor::GetImplementation( *mAdaptor ).SetViewMode( viewMode );
    }

diff --cc build/tizen/adaptor/configure.ac
index d98445e3fa8cae354c369f35a22d19442a55514c,de27247e87d4f641ef892541935ffd8fe275db90..7b921be9da614908964113cf363de75c87d06c88
--- 1/build/tizen/adaptor/configure.ac
--- 2/build/tizen/adaptor/configure.ac
+++ b/build/tizen/adaptor/configure.ac
@@@ -379,7 -370,6 +379,8 @@@ Configuratio
    Using Tizen APP FW libraries:     $enable_appfw
    OpenGL ES version:                $enable_gles
    Tizen Platform Config supported   $tizenPlatformConfigSupported
 +  Use TizenVR Engine:               $enable_tizenvr
++
  "
  # optional output of node.js source path if we're building with libuv
  if test "x$build_for_libuv" != "xno"; then

diff --cc packaging/dali-adaptor.spec
Simple merge