diff --git a/YACReader/main_window_viewer.cpp b/YACReader/main_window_viewer.cpp
index 7e50a73b..62a43c1a 100644
--- a/YACReader/main_window_viewer.cpp
+++ b/YACReader/main_window_viewer.cpp
@@ -312,7 +312,7 @@ void MainWindowViewer::createToolBars()
 	comicToolBar->addAction(prevAction);
 	comicToolBar->addAction(nextAction);
 	comicToolBar->addAction(goToPage);
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 	comicToolBar->addSeparator();
 	comicToolBar->addAction(alwaysOnTopAction);
 #else
diff --git a/YACReader/notifications_label_widget.cpp b/YACReader/notifications_label_widget.cpp
index ffd82c32..33810644 100644
--- a/YACReader/notifications_label_widget.cpp
+++ b/YACReader/notifications_label_widget.cpp
@@ -42,7 +42,7 @@ NotificationsLabelWidget::NotificationsLabelWidget(QWidget * parent)
 	textLabel->setAttribute(Qt::WA_LayoutUsesWidgetRect,true);
 
 	textLabel->setGeometry(imgLabel->geometry());
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 	imgLabel->setGraphicsEffect(effect);
 	textLabel->setGraphicsEffect(effect2);
 #endif
diff --git a/YACReader/viewer.cpp b/YACReader/viewer.cpp
index c0449ca3..cf033c94 100644
--- a/YACReader/viewer.cpp
+++ b/YACReader/viewer.cpp
@@ -661,7 +661,7 @@ void Viewer::configureContent(QString msg)
 
 void Viewer::hideCursor()
 {
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 	setCursor(QCursor(QBitmap(1,1),QBitmap(1,1)));
 #else
 	setCursor(Qt::BlankCursor);
diff --git a/YACReaderLibrary/import_widget.cpp b/YACReaderLibrary/import_widget.cpp
index d9928ac2..f323b6bd 100644
--- a/YACReaderLibrary/import_widget.cpp
+++ b/YACReaderLibrary/import_widget.cpp
@@ -73,7 +73,7 @@ YACReaderActivityIndicatorWidget::YACReaderActivityIndicatorWidget(QWidget * par
 	animation2->setEndValue(1);
 	//animation2->setEasingCurve(QEasingCurve::InQuint);
 
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 	glow->setGraphicsEffect(effect);
 #endif
 
diff --git a/YACReaderLibrary/library_creator.cpp b/YACReaderLibrary/library_creator.cpp
index 57068bd8..ab3d57bd 100644
--- a/YACReaderLibrary/library_creator.cpp
+++ b/YACReaderLibrary/library_creator.cpp
@@ -177,7 +177,7 @@ void LibraryCreator::create(QDir dir)
 			return;
 		QFileInfo fileInfo = list.at(i);
 		QString fileName = fileInfo.fileName();
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
         QStringList src = _source.split("/");
 		QString filePath = fileInfo.absoluteFilePath();
         QStringList fp = filePath.split("/");
@@ -476,7 +476,7 @@ void ThumbnailCreator::create()
 		delete _7z;
 		attributes.clear();
 		_currentName = QDir::fromNativeSeparators(_currentName).split('/').last(); //separator fixed. 
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 		attributes << "e" << "-so" << "-r" << _fileSource << QString(_currentName.toLocal8Bit().constData()); //TODO platform dependency?? OEM 437
 #else
 		attributes << "e" << "-so" << "-r" << _fileSource << _currentName; //TODO platform dependency?? OEM 437
diff --git a/YACReaderLibrary/library_window.cpp b/YACReaderLibrary/library_window.cpp
index 8610cc8d..be84fff4 100644
--- a/YACReaderLibrary/library_window.cpp
+++ b/YACReaderLibrary/library_window.cpp
@@ -965,7 +965,7 @@ void LibraryWindow::openComic()
 	{
 		QString path = currentPath() + dmCV->getComicPath(comicView->currentIndex());
 		
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 		
 		QProcess::startDetached("open", QStringList() << "-n" << QDir::cleanPath(QCoreApplication::applicationDirPath()+"/../../../YACReader.app") << "--args" << path);//,QStringList() << path);
 		//Comic is readed
diff --git a/YACReaderLibrary/server_config_dialog.cpp b/YACReaderLibrary/server_config_dialog.cpp
index fa19cbd4..89ce1b11 100644
--- a/YACReaderLibrary/server_config_dialog.cpp
+++ b/YACReaderLibrary/server_config_dialog.cpp
@@ -10,7 +10,7 @@
 #include "startup.h"
 #include "yacreader_global.h"
 
-#ifndef Q_WS_WIN
+#ifndef Q_OS_WIN32
 
 #include <sys/types.h>
 #include <ifaddrs.h>
@@ -190,7 +190,7 @@ void ServerConfigDialog::generateQR()
 	//}
 	ip->clear();
 	QString dir;
-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
 	QList<QHostAddress> list = QHostInfo::fromName( QHostInfo::localHostName()  ).addresses();
 
 	QList<QString> otherAddresses;
@@ -244,7 +244,7 @@ void ServerConfigDialog::generateQR()
 
 	}
 	//qrCode->setText(dir+":8080");
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
     ip->setFixedWidth(130);
 #endif
 }
diff --git a/common/check_new_version.cpp b/common/check_new_version.cpp
index 675c6c47..b6347f2d 100644
--- a/common/check_new_version.cpp
+++ b/common/check_new_version.cpp
@@ -88,18 +88,18 @@ void HttpVersionChecker::httpRequestFinished(int requestId, bool error)
 //TODO escribir prueba unitaria
 bool HttpVersionChecker::checkNewVersion(QString sourceContent)
 {
-	#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN32
     QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}win32.*");
 #endif
 
-#ifdef  Q_WS_X11
+#ifdef  Q_OS_LINUX
     QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}X11.*");
 #endif
 
-#ifdef  Q_WS_MAC
+#ifdef  Q_OS_MAC
     QRegExp rx(".*YACReader\\-([0-9]+).([0-9]+).([0-9]+)\\.?([0-9]+)?.{0,5}Mac.*");
 #endif
-
+	
     int index = 0;
     bool newVersion = false;
     bool sameVersion = true;
diff --git a/common/yacreader_flow_gl.cpp b/common/yacreader_flow_gl.cpp
index 39cc7fac..6a856fa0 100644
--- a/common/yacreader_flow_gl.cpp
+++ b/common/yacreader_flow_gl.cpp
@@ -4,7 +4,7 @@
 #include <QtOpenGL>
 //#include <math.h>
 
-#ifdef Q_WS_MAC
+#ifdef Q_OS_MAC
 	#include <OpenGL/glu.h>
 #else
 	#include <GL/glu.h>