Qt 5 Porting: Q_WS_WIN -> Q_OS_WIN

(cherry picked from commit 4c1df50d522a09577274e19a8fe66bd865f3a2da)

diff --git a/src/kitemviews/private/kdirectorycontentscounterworker.cpp b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
index e649c20e142f3cbaa024b3242862c4afcea0c3d3..47fbb5dd51e7916e87400d2ba2b4dbee797dad94 100644 (file)
--- a/src/kitemviews/private/kdirectorycontentscounterworker.cpp
+++ b/src/kitemviews/private/kdirectorycontentscounterworker.cpp
@@ -21,7 +21,7 @@
 #include "kdirectorycontentscounterworker.h"
 
 // Required includes for subItemsCount():
 #include "kdirectorycontentscounterworker.h"
 
 // Required includes for subItemsCount():

-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN

     #include <QDir>
 #else
     #include <dirent.h>
     #include <QDir>
 #else
     #include <dirent.h>


@@ -39,7 +39,7 @@ int KDirectoryContentsCounterWorker::subItemsCount(const QString& path, Options
     const bool countHiddenFiles = options & CountHiddenFiles;
     const bool countDirectoriesOnly = options & CountDirectoriesOnly;
 
     const bool countHiddenFiles = options & CountHiddenFiles;
     const bool countDirectoriesOnly = options & CountDirectoriesOnly;
 

-#ifdef Q_WS_WIN
+#ifdef Q_OS_WIN

     QDir dir(path);
     QDir::Filters filters = QDir::NoDotAndDotDot | QDir::System;
     if (countHiddenFiles) {
     QDir dir(path);
     QDir::Filters filters = QDir::NoDotAndDotDot | QDir::System;
     if (countHiddenFiles) {