removed QNoImplicitBoolCast, it seems to be gone in Qt 5.3

florianlink · florianlink · commit aea939214ad1 · 2014-09-02T12:39:26.000Z
added extra qualifier if flags are used
diff --git a/generator/shellgenerator.cpp b/generator/shellgenerator.cpp
@@ -144,6 +144,11 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s, const AbstractMetaCl
               qualifier = ((FlagsTypeEntry *)arg->type()->typeEntry())->originator()->qualifier();
             }
             if (!qualifier.isEmpty()) {
+              int index = expr.indexOf("(");
+              if (index > 0) {
+                // insert qualifier for Flags(Flag) -> Flags(Qualifier::Flag) support
+                expr = expr.mid(0, index + 1) + qualifier + "::" + expr.mid(index + 1);
+              }
               s << qualifier << "::";
             }
           }
diff --git a/generator/typesystem_core.xml b/generator/typesystem_core.xml
@@ -1116,11 +1116,6 @@
   <interface-type name="QFactoryInterface"/>
 
   <value-type name="QByteArray">
-
-    <extra-includes>
-      <include file-name="QNoImplicitBoolCast" location="global"/>
-    </extra-includes>
-
     <!-- removed functions -->
     <modify-function signature="begin()" remove="all"/>
     <modify-function signature="begin()const" remove="all"/>

Original file line number	Diff line number	Diff line change
`@@ -144,6 +144,11 @@ void ShellGenerator::writeFunctionArguments(QTextStream &s, const AbstractMetaCl`
`144`	`144`	`qualifier = ((FlagsTypeEntry *)arg->type()->typeEntry())->originator()->qualifier();`
`145`	`145`	`}`
`146`	`146`	`if (!qualifier.isEmpty()) {`
	`147`	`+ int index = expr.indexOf("(");`
	`148`	`+ if (index > 0) {`
	`149`	`+ // insert qualifier for Flags(Flag) -> Flags(Qualifier::Flag) support`
	`150`	`+ expr = expr.mid(0, index + 1) + qualifier + "::" + expr.mid(index + 1);`
	`151`	`+ }`
`147`	`152`	`s << qualifier << "::";`
`148`	`153`	`}`
`149`	`154`	`}`