wip

.travis.yml

@@ -13,11 +13,23 @@ compiler:
 
 env:
   matrix:
-    - QT=59 BREW=@5.9 PPA=beineri/opt-qt591-trusty
-
+    - QT=59 BREW=ex  PPA=beineri/opt-qt591-trusty
+    - QT=59 BREW=ex  PPA=beineri/opt-qt592-trusty
+    - QT=59 BREW=ex  PPA=beineri/opt-qt593-trusty
+    - QT=59 BREW=ex  PPA=beineri/opt-qt594-trusty
+    - QT=59 BREW=ex  PPA=beineri/opt-qt595-trusty
+    - QT=59 BREW=ex  PPA=beineri/opt-qt596-trusty
+    - QT=510 BREW=ex PPA=beineri/opt-qt-5.10.1-trusty
+    
 matrix:
   exclude:
-    - { os: osx, env: QT=58 BREW=ex   PPA=beineri/opt-qt58-trusty  }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt591-trusty }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt592-trusty }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt593-trusty }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt594-trusty }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt595-trusty }
+    - { os: osx, env: QT=59 BREW=ex  PPA=beineri/opt-qt596-trusty }
+    - { os: osx, env: QT=510 BREW=ex PPA=beineri/opt-qt-5.10.1-trusty }
 
 addons:
   coverity_scan:

src/phrases/conditionalphrase.h

@@ -24,7 +24,7 @@ public:
 #ifdef Q_COMPILER_RVALUE_REFS
     ConditionalPhrase(const ConditionalPhrase &&other);
 #endif
-    ConditionalPhrase(const PhraseData *data);
+    explicit ConditionalPhrase(const PhraseData *data);
     ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition);
     ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const QVariant &v);
     ConditionalPhrase(AbstractFieldPhrase *, PhraseData::Condition, const AbstractFieldPhrase &v);

src/phrases/fieldphrase.h

@@ -15,9 +15,14 @@ public:
         AbstractFieldPhrase(className, s)
     {}
 
-    AssignmentPhrase operator =(const QVariant &other) {
+    AssignmentPhrase operator =(const T &other) {
         return AssignmentPhrase(this, other);
     }
+
+    ConditionalPhrase operator ==(const T &other) {
+        return ConditionalPhrase(this, PhraseData::Equal, other);
+    }
+
 };