diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf
index 87f6c703c..e9bd9ccbc 100644
--- a/scripts/mkqtdecl4/mkqtdecl.conf
+++ b/scripts/mkqtdecl4/mkqtdecl.conf
@@ -10,6 +10,8 @@
 # drops enum members
 drop_enum_const "Qt", /WindowType::WindowSoftkeysVisibleHint/
 drop_enum_const "Qt", /WindowType::WindowSoftkeysRespondHint/
+drop_enum_const "Qt", /WindowType::WindowOkButtonHint/ # only available on CE
+drop_enum_const "Qt", /WindowType::WindowCancelButtonHint/ # only available on CE
 
 # --------------------------------------------------------------
 # QtCore
diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
index ee58b82a4..7b4079c01 100644
--- a/scripts/mkqtdecl5/mkqtdecl.conf
+++ b/scripts/mkqtdecl5/mkqtdecl.conf
@@ -10,6 +10,8 @@
 # drops enum members
 drop_enum_const "Qt", /WindowType::WindowSoftkeysVisibleHint/
 drop_enum_const "Qt", /WindowType::WindowSoftkeysRespondHint/
+drop_enum_const "Qt", /WindowType::WindowOkButtonHint/ # only available on CE
+drop_enum_const "Qt", /WindowType::WindowCancelButtonHint/ # only available on CE
 
 # --------------------------------------------------------------
 # QtCore
diff --git a/src/gsiqt4/gsiDeclQt_3.cc b/src/gsiqt4/gsiDeclQt_3.cc
index 005514505..4f74bb9fb 100644
--- a/src/gsiqt4/gsiDeclQt_3.cc
+++ b/src/gsiqt4/gsiDeclQt_3.cc
@@ -453,9 +453,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType",
     gsi::enum_const ("WindowStaysOnBottomHint", Qt::WindowStaysOnBottomHint, "@brief Enum constant Qt::WindowStaysOnBottomHint") +
     gsi::enum_const ("WindowCloseButtonHint", Qt::WindowCloseButtonHint, "@brief Enum constant Qt::WindowCloseButtonHint") +
     gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") +
-    gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") +
-    gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") +
-    gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"),
+    gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget"),
   "@qt\n@brief This class represents the Qt::WindowType enum");
 
 static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType",
diff --git a/src/gsiqt5/gsiDeclQt_4.cc b/src/gsiqt5/gsiDeclQt_4.cc
index fdceadbce..6c7fb4b81 100644
--- a/src/gsiqt5/gsiDeclQt_4.cc
+++ b/src/gsiqt5/gsiDeclQt_4.cc
@@ -21,9 +21,9 @@
 */
 
 /**
-*  @file gsiDeclQt_4.cc
+*  @file gsiDeclQt_4.cc 
 *
-*  DO NOT EDIT THIS FILE.
+*  DO NOT EDIT THIS FILE. 
 *  This file has been created automatically
 */
 
@@ -153,15 +153,7 @@ static gsi::Enum<Qt::WindowType> decl_Qt_WindowType_Enum ("Qt_WindowType",
     gsi::enum_const ("MacWindowToolBarButtonHint", Qt::MacWindowToolBarButtonHint, "@brief Enum constant Qt::MacWindowToolBarButtonHint") +
     gsi::enum_const ("BypassGraphicsProxyWidget", Qt::BypassGraphicsProxyWidget, "@brief Enum constant Qt::BypassGraphicsProxyWidget") +
     gsi::enum_const ("NoDropShadowWindowHint", Qt::NoDropShadowWindowHint, "@brief Enum constant Qt::NoDropShadowWindowHint") +
-#if defined(__APPLE__)
-    // Qt::WindowOkButtonHint and  Qt::WindowCancelButtonHint are supported for Windows CE.
-    // By Kazunari Sekigawa (December 10, 2017)
     gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint"),
-#else
-    gsi::enum_const ("WindowFullscreenButtonHint", Qt::WindowFullscreenButtonHint, "@brief Enum constant Qt::WindowFullscreenButtonHint") +
-    gsi::enum_const ("WindowOkButtonHint", Qt::WindowOkButtonHint, "@brief Enum constant Qt::WindowOkButtonHint") +
-    gsi::enum_const ("WindowCancelButtonHint", Qt::WindowCancelButtonHint, "@brief Enum constant Qt::WindowCancelButtonHint"),
-#endif
   "@qt\n@brief This class represents the Qt::WindowType enum");
 
 static gsi::QFlagsClass<Qt::WindowType > decl_Qt_WindowType_Enums ("Qt_QFlags_WindowType",