Skip to content

Commit df2cac7

Browse files
m-kuhnm-kuhn
committedJan 5, 2015
Merge pull request #1743 from naihil/master
[Qt5-compat] Change Q_WS_* macroses to Q_OS_*
·
ltr-3_40archive/master_2
2 parents b905f6b + ea00b36 commit df2cac7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+90
-90
lines changed
 

‎src/app/composer/qgscomposer.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
195195

196196
mActionAtlasPreview->setCheckable( true );
197197

198-
#ifdef Q_WS_MAC
198+
#ifdef Q_OS_MAC
199199
mActionQuit->setText( tr( "Close" ) );
200200
mActionQuit->setShortcut( QKeySequence::Close );
201201
QMenu *appMenu = menuBar()->addMenu( tr( "QGIS" ) );
@@ -307,7 +307,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
307307
QShortcut* ctrlEquals = new QShortcut( QKeySequence( "Ctrl+=" ), this );
308308
connect( ctrlEquals, SIGNAL( activated() ), mActionZoomIn, SLOT( trigger() ) );
309309

310-
#ifndef Q_WS_MAC
310+
#ifndef Q_OS_MAC
311311
//disabled for OSX - see #10761
312312
//also see http://qt-project.org/forums/viewthread/3630 QGraphicsEffects are not well supported on OSX
313313
QMenu *previewMenu = viewMenu->addMenu( "&Preview" );
@@ -404,7 +404,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
404404
QMenu *settingsMenu = menuBar()->addMenu( tr( "&Settings" ) );
405405
settingsMenu->addAction( mActionOptions );
406406

407-
#ifdef Q_WS_MAC
407+
#ifdef Q_OS_MAC
408408
// this doesn't work on Mac anymore: menuBar()->addMenu( mQgis->windowMenu() );
409409
// QgsComposer::populateWithOtherMenu should work recursively with submenus and regardless of Qt version
410410
mWindowMenu = new QMenu( tr( "Window" ), this );
@@ -802,7 +802,7 @@ void QgsComposer::activate()
802802
}
803803
}
804804

805-
#ifdef Q_WS_MAC
805+
#ifdef Q_OS_MAC
806806
void QgsComposer::changeEvent( QEvent* event )
807807
{
808808
QMainWindow::changeEvent( event );
@@ -2950,7 +2950,7 @@ void QgsComposer::showEvent( QShowEvent* event )
29502950
restoreComposerMapStates();
29512951
}
29522952

2953-
#ifdef Q_WS_MAC
2953+
#ifdef Q_OS_MAC
29542954
// add to menu if (re)opening window (event not due to unminimize)
29552955
if ( !event->spontaneous() )
29562956
{

‎src/app/composer/qgscomposer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
114114

115115
virtual void showEvent( QShowEvent* event );
116116

117-
#ifdef Q_WS_MAC
117+
#ifdef Q_OS_MAC
118118
//! Change event (update window menu on ActivationChange)
119119
virtual void changeEvent( QEvent * );
120120
#endif

0 commit comments

Comments
 (0)
Please sign in to comment.