Change Q_WS_X11 to Q_OS_UNIX for Qt5 compatibility

qgis · Dec 24, 2014 · ea00b36 · ea00b36
1 parent d5d4a5a
commit ea00b36
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -599,7 +599,7 @@ int main( int argc, char *argv[] )
   // Initialise the application and the translation stuff
   /////////////////////////////////////////////////////////////////////
 
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
   bool myUseGuiFlag = getenv( "DISPLAY" ) != 0;
 #else
   bool myUseGuiFlag = true;

diff --git a/src/app/qgisappstylesheet.cpp b/src/app/qgisappstylesheet.cpp
@@ -262,7 +262,7 @@ void QgisAppStyleSheet::setActiveValues()
 #endif
 
   // window servers
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
   mX11WS = true;
 #else
   mX11WS = false;

diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
@@ -304,7 +304,7 @@ void QgsMapToolOffsetCurve::createDistanceItem()
   mDistanceSpinBox->setMaximum( 99999999 );
   mDistanceSpinBox->setDecimals( 2 );
   mDistanceSpinBox->setPrefix( tr( "Offset: " ) );
-#ifndef Q_WS_X11
+#ifndef Q_OS_UNIX
   mDistanceItem = new QGraphicsProxyWidget();
   mDistanceItem->setWidget( mDistanceSpinBox );
   mCanvas->scene()->addItem( mDistanceItem );
@@ -326,7 +326,7 @@ void QgsMapToolOffsetCurve::deleteDistanceItem()
   }
   delete mDistanceItem;
   mDistanceItem = 0;
-#ifdef Q_WS_X11
+#ifdef Q_OS_UNIX
   QgisApp::instance()->statusBar()->removeWidget( mDistanceSpinBox );
   delete mDistanceSpinBox;
 #endif