Skip to content
Permalink
Browse files

Change Q_WS_X11 to Q_OS_UNIX for Qt5 compatibility

  • Loading branch information
naihil committed Dec 24, 2014
1 parent d5d4a5a commit ea00b36985b5a1d0d5444121f443ec9bb5e0da72
Showing with 4 additions and 4 deletions.
  1. +1 −1 src/app/main.cpp
  2. +1 −1 src/app/qgisappstylesheet.cpp
  3. +2 −2 src/app/qgsmaptooloffsetcurve.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;
@@ -262,7 +262,7 @@ void QgisAppStyleSheet::setActiveValues()
#endif

// window servers
#ifdef Q_WS_X11
#ifdef Q_OS_UNIX
mX11WS = true;
#else
mX11WS = false;
@@ -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

0 comments on commit ea00b36

Please sign in to comment.
You can’t perform that action at this time.