diff --git a/Qt_EQL/cpp/lib.h b/Qt_EQL/cpp/lib.h
index ae23fc2..7a0b724 100644
--- a/Qt_EQL/cpp/lib.h
+++ b/Qt_EQL/cpp/lib.h
@@ -3,7 +3,7 @@
 
 #include <QtWidgets>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/Qt_EQL/cpp_calling_lisp/lib.h b/Qt_EQL/cpp_calling_lisp/lib.h
index 8235860..01e2e18 100644
--- a/Qt_EQL/cpp_calling_lisp/lib.h
+++ b/Qt_EQL/cpp_calling_lisp/lib.h
@@ -3,7 +3,7 @@
 
 #include <QtWidgets>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/Qt_EQL/trafficlight/lib.h b/Qt_EQL/trafficlight/lib.h
index 994f6dc..94c6dd1 100644
--- a/Qt_EQL/trafficlight/lib.h
+++ b/Qt_EQL/trafficlight/lib.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/Qt_EQL_plugin/qt_plugin.h b/Qt_EQL_plugin/qt_plugin.h
index 46aa05d..5f8012c 100644
--- a/Qt_EQL_plugin/qt_plugin.h
+++ b/Qt_EQL_plugin/qt_plugin.h
@@ -3,7 +3,7 @@
 
 #include <Qt>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.h b/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.h
index 64f3c5f..c8531b6 100644
--- a/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.h
+++ b/examples/M-modules/quick/Tic-Tac-Toe/lib/qml_lisp.h
@@ -5,7 +5,7 @@
 #include <QQuickPaintedItem>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/quick/item-model/lib/qml_lisp.h b/examples/M-modules/quick/item-model/lib/qml_lisp.h
index 64f3c5f..c8531b6 100644
--- a/examples/M-modules/quick/item-model/lib/qml_lisp.h
+++ b/examples/M-modules/quick/item-model/lib/qml_lisp.h
@@ -5,7 +5,7 @@
 #include <QQuickPaintedItem>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/quick/painted-item/lib/qml_lisp.h b/examples/M-modules/quick/painted-item/lib/qml_lisp.h
index 64f3c5f..c8531b6 100644
--- a/examples/M-modules/quick/painted-item/lib/qml_lisp.h
+++ b/examples/M-modules/quick/painted-item/lib/qml_lisp.h
@@ -5,7 +5,7 @@
 #include <QQuickPaintedItem>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/quick/palindrome-2/lib/qml_lisp.h b/examples/M-modules/quick/palindrome-2/lib/qml_lisp.h
index 64f3c5f..c8531b6 100644
--- a/examples/M-modules/quick/palindrome-2/lib/qml_lisp.h
+++ b/examples/M-modules/quick/palindrome-2/lib/qml_lisp.h
@@ -5,7 +5,7 @@
 #include <QQuickPaintedItem>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/quick/qml-lisp/lib/qml_lisp.h b/examples/M-modules/quick/qml-lisp/lib/qml_lisp.h
index 64f3c5f..c8531b6 100644
--- a/examples/M-modules/quick/qml-lisp/lib/qml_lisp.h
+++ b/examples/M-modules/quick/qml-lisp/lib/qml_lisp.h
@@ -5,7 +5,7 @@
 #include <QQuickPaintedItem>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.h b/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.h
index f378c1d..1ff5fa0 100644
--- a/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.h
+++ b/examples/M-modules/webkit/Examples-Browser/lib/webkit_bridge.h
@@ -5,7 +5,7 @@
 #include <QtWebKit>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.h b/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.h
index 4f57256..7ac701a 100644
--- a/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.h
+++ b/examples/M-modules/webkit/Tic-Tac-Toe/lib/webkit_bridge.h
@@ -5,7 +5,7 @@
 #include <QtWebKitWidgets>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/M-modules/webkit/lib/webkit_bridge.h b/examples/M-modules/webkit/lib/webkit_bridge.h
index 4f57256..7ac701a 100644
--- a/examples/M-modules/webkit/lib/webkit_bridge.h
+++ b/examples/M-modules/webkit/lib/webkit_bridge.h
@@ -5,7 +5,7 @@
 #include <QtWebKitWidgets>
 #include <eql_fun.h>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/X-extras/move-blocks/cpp/lib.h b/examples/X-extras/move-blocks/cpp/lib.h
index c4c854d..e4f91f9 100644
--- a/examples/X-extras/move-blocks/cpp/lib.h
+++ b/examples/X-extras/move-blocks/cpp/lib.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/examples/X-extras/qimage/cpp/lib.h b/examples/X-extras/qimage/cpp/lib.h
index 70431aa..503219c 100644
--- a/examples/X-extras/qimage/cpp/lib.h
+++ b/examples/X-extras/qimage/cpp/lib.h
@@ -3,7 +3,7 @@
 
 #include <QtGui>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/help/_ini.h b/src/gen/help/_ini.h
index a9b57cf..3cfcb56 100644
--- a/src/gen/help/_ini.h
+++ b/src/gen/help/_ini.h
@@ -4,7 +4,7 @@
 #include "../../ecl_fun.h"
 #include <QtHelp>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/multimedia/_ini.h b/src/gen/multimedia/_ini.h
index 5114602..9b769d7 100644
--- a/src/gen/multimedia/_ini.h
+++ b/src/gen/multimedia/_ini.h
@@ -5,7 +5,7 @@
 #include <QtMultimedia>
 #include <QtMultimediaWidgets>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/my/_ini.h b/src/gen/my/_ini.h
index 8f7abaf..349d22b 100644
--- a/src/gen/my/_ini.h
+++ b/src/gen/my/_ini.h
@@ -6,7 +6,7 @@
 
 // Q_DECLARE_METATYPE(Q...)
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/network/_ini.h b/src/gen/network/_ini.h
index 53a6d73..df3e81e 100644
--- a/src/gen/network/_ini.h
+++ b/src/gen/network/_ini.h
@@ -7,7 +7,7 @@
 Q_DECLARE_METATYPE(QNetworkCacheMetaData)
 Q_DECLARE_METATYPE(QList<QNetworkProxy>)
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/quick/_ini.h b/src/gen/quick/_ini.h
index 51e2705..ac82522 100644
--- a/src/gen/quick/_ini.h
+++ b/src/gen/quick/_ini.h
@@ -6,7 +6,7 @@
 #include <QtQuickWidgets>
 #include <QQmlError>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/sql/_ini.h b/src/gen/sql/_ini.h
index 4fb8a34..d3df431 100644
--- a/src/gen/sql/_ini.h
+++ b/src/gen/sql/_ini.h
@@ -7,7 +7,7 @@
 Q_DECLARE_METATYPE(QSqlIndex)
 Q_DECLARE_METATYPE(QSqlRecord)
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/svg/_ini.h b/src/gen/svg/_ini.h
index fd2efd8..436d6b4 100644
--- a/src/gen/svg/_ini.h
+++ b/src/gen/svg/_ini.h
@@ -3,7 +3,7 @@
 
 #include <QtSvg>
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT
diff --git a/src/gen/webkit/_ini.h b/src/gen/webkit/_ini.h
index 56d78da..094094e 100644
--- a/src/gen/webkit/_ini.h
+++ b/src/gen/webkit/_ini.h
@@ -6,7 +6,7 @@
 
 Q_DECLARE_METATYPE(QList<QWebPluginFactory::Plugin>)
 
-#ifdef Q_OS_WIN
+#ifdef Q_CC_MSVC
 #define LIB_EXPORT __declspec(dllexport)
 #else
 #define LIB_EXPORT