diff --git a/scripts/mkqtdecl4/mkqtdecl.conf b/scripts/mkqtdecl4/mkqtdecl.conf
index 0eee55821..b077f7ac5 100644
--- a/scripts/mkqtdecl4/mkqtdecl.conf
+++ b/scripts/mkqtdecl4/mkqtdecl.conf
@@ -229,7 +229,7 @@ drop_method "QObject", /QObject::userData/ # QObjectUserData not available
 drop_method "QChildEvent", /QChildEvent::child/ # provided through a special implementation
 drop_method "QFile", /QFile::setDecodingFunction/ # uses callbacks
 drop_method "QFile", /QFile::setEncodingFunction/ # uses callbacks
-drop_method "QFile", /QFile::open.*IO_FILE/ # uses internal struct
+drop_method "QFile", /QFile::open.*FILE/ # uses internal struct
 drop_method "QPrinter", /QPrinter::printerSelectionOption/ # not available on WIN
 drop_method "QPrinter", /QPrinter::setPrinterSelectionOption/ # not available on WIN
 drop_method "QSessionManager", /QSessionManager::handle/ # not available on WIN
@@ -263,8 +263,8 @@ drop_method "QFile", /QFile::decodeName\(const\s+QByteArray/ # clashes with cons
 drop_method "QTemporaryFile", /QTemporaryFile::open\(int/ # unsupported file descriptor
 drop_method "QTextStream", /QTextStream::QTextStream\(QByteArray/ # clashes with QString variant
 drop_method "QTextStream", /QTextStream::QTextStream\(const\s*QByteArray/ # clashes with QString variant
-drop_method "QTextStream", /QTextStream::QTextStream\(.*_IO_FILE/ # unsupported IO_FILE
-drop_method "QTextStream", /QTextStream::QTextStream\(.*_IO_FILE/ # unsupported IO_FILE
+drop_method "QTextStream", /QTextStream::QTextStream\(.*FILE/ # unsupported FILE
+drop_method "QTextStream", /QTextStream::QTextStream\(.*FILE/ # unsupported FILE
 drop_method "", /::operator\s*>>\(QTextStream\s*&/ # implemented through read
 drop_method "", /::operator\s*<<\(QTextStream\s*&/ # implemented through put
 drop_method "QTextStream", /::operator\s*>>/ # implemented through read
diff --git a/scripts/mkqtdecl5/mkqtdecl.conf b/scripts/mkqtdecl5/mkqtdecl.conf
index 7e762c34c..5d7330ad3 100644
--- a/scripts/mkqtdecl5/mkqtdecl.conf
+++ b/scripts/mkqtdecl5/mkqtdecl.conf
@@ -289,7 +289,7 @@ drop_method "QObject", /QObject::setUserData/ # QObjectUserData not available
 drop_method "QObject", /QObject::userData/ # QObjectUserData not available
 drop_method "QFile", /QFile::setDecodingFunction/ # uses callbacks
 drop_method "QFile", /QFile::setEncodingFunction/ # uses callbacks
-drop_method "QFile", /QFile::open.*IO_FILE/ # uses internal struct
+drop_method "QFile", /QFile::open.*FILE/ # uses internal struct
 drop_method "QFileInfo", /QFileInfo::QFileInfo\(QFileInfoPrivate\s+\*/ # uses internal struct
 drop_method "QPrinter", /QPrinter::printerSelectionOption/ # not available on WIN
 drop_method "QPrinter", /QPrinter::setPrinterSelectionOption/ # not available on WIN
@@ -330,8 +330,8 @@ drop_method "QFile", /QFile::decodeName\(const\s+QByteArray/ # clashes with cons
 drop_method "QTemporaryFile", /QTemporaryFile::open\(int/ # unsupported file descriptor
 drop_method "QTextStream", /QTextStream::QTextStream\(QByteArray/ # clashes with QString variant
 drop_method "QTextStream", /QTextStream::QTextStream\(const\s*QByteArray/ # clashes with QString variant
-drop_method "QTextStream", /QTextStream::QTextStream\(.*_IO_FILE/ # unsupported IO_FILE
-drop_method "QTextStream", /QTextStream::QTextStream\(.*_IO_FILE/ # unsupported IO_FILE
+drop_method "QTextStream", /QTextStream::QTextStream\(.*FILE/ # unsupported FILE
+drop_method "QTextStream", /QTextStream::QTextStream\(.*FILE/ # unsupported FILE
 drop_method "", /::operator\s*>>\(QTextStream\s*&/ # implemented through read
 drop_method "", /::operator\s*<<\(QTextStream\s*&/ # implemented through put
 drop_method "QTextStream", /::operator\s*>>/ # implemented through read
diff --git a/scripts/mkqtdecl_common/c++.treetop b/scripts/mkqtdecl_common/c++.treetop
index 5eb54c856..be08617c7 100644
--- a/scripts/mkqtdecl_common/c++.treetop
+++ b/scripts/mkqtdecl_common/c++.treetop
@@ -286,12 +286,8 @@ grammar CPP
     "noexcept" ( s "(" s block s ")" )?
   end
 
-  rule func_assign_spec
-    "=" s ( "delete" / "0" )?
-  end
-
   rule func_spec
-    "(" s fa:( a:func_args )? s ")" cvspec:( s cv:cv )? ( s "throw" s "(" s ( type_wo_comma s )? ")" / s noexcept_spec / s func_assign_spec / s override_key )* a <PFuncSpec>
+    "(" s fa:( a:func_args )? s ")" cvspec:( s cv:cv )? ( s "throw" s "(" s ( type_wo_comma s )? ")" / s noexcept_spec / s override_key )* a <PFuncSpec>
   end
 
   rule member_pointer
@@ -315,15 +311,19 @@ grammar CPP
     <PInnerType>
   end
 
+  rule init_spec
+    block_wo_comma / "delete" / "0"
+  end
+
   rule type
     cvspec:( cv:cv s )? 
     a
     ( "typename" ![a-zA-Z0-9_] s )? 
     ct:concrete_type 
     a
-    il:( s t1:inner_type i1:(s "=" s is1:block_wo_comma)? tt:( s "," s t2:inner_type i2:(s "=" s is2:block_wo_comma)? )* )? 
+    il:( s t1:inner_type i1:(s "=" s is1:init_spec)? tt:( s "," s t2:inner_type i2:(s "=" s is2:init_spec)? )* )? 
     # alternative initialization if only a concrete type is given:
-    pi:( s "=" s is:block_wo_comma )? 
+    pi:( s "=" s is:init_spec )? 
     <PType>
   end
 
@@ -332,9 +332,9 @@ grammar CPP
     a
     ( "typename" ![a-zA-Z0-9_] s )? 
     ct:concrete_type 
-    il:( s t:inner_type i:(s "=" s is:block_wo_comma)? )? 
+    il:( s t:inner_type i:(s "=" s is:init_spec)? )? 
     # alternative initialization if only a concrete type is given:
-    pi:( s "=" s is:block_wo_comma )? 
+    pi:( s "=" s is:init_spec )? 
     <PTypeWoComma>
   end