commit 992116ed0448e36a0d42f634d1d4599b16341046
Author: Christian Ehringfeld <c.ehringfeld@t-online.de>
Date:   Sat Jun 27 23:02:24 2015 +0200

    small bugfxi

diff --git a/example/Example.pro b/example/Example.pro
index c39e8ad..85b4184 100644
--- a/example/Example.pro
+++ b/example/Example.pro
@@ -33,7 +33,7 @@ SOURCES += \
 unix:!macx: LIBS += -L$$PWD/../../build-EntityManager-Desktop-Debug -lCuteEntityManager
 unix:INCLUDEPATH += $$PWD/../src
 unix:DEPENDPATH += $$PWD/../src
-CONFIG += c++11
+CONFIG += c++14
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop_Qt_5_4_1_MinGW_32bit-Debug/release/ -lCuteEntityManager
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../../build-EntityManager-Desktop_Qt_5_4_1_MinGW_32bit-Debug/debug/ -lCuteEntityManager
diff --git a/src/entityinstancefactory.cpp b/src/entityinstancefactory.cpp
index c44a9c7..6731f52 100644
--- a/src/entityinstancefactory.cpp
+++ b/src/entityinstancefactory.cpp
@@ -26,8 +26,9 @@ Entity *EntityInstanceFactory::createInstance(const char *className) {
     if (!s.contains("*")) {
         s.append("*");
     }
-    return EntityInstanceFactory::createInstance(QMetaType::type(
-                s.toUtf8().constData()));
+    int type = QMetaType::type(
+                    s.toUtf8().constData());
+    return EntityInstanceFactory::createInstance(type);
 }
 
 Entity *EntityInstanceFactory::createInstance(const QString &className) {
diff --git a/src/querybuilder.cpp b/src/querybuilder.cpp
index 9beaf26..20bd840 100644
--- a/src/querybuilder.cpp
+++ b/src/querybuilder.cpp
@@ -836,7 +836,7 @@ QList<QueryBuilder::ClassAttributes> QueryBuilder::inheritedAttributes(
         auto usedProperties = QHash<QString, QMetaProperty>();
         auto usedRelations = QHash<QString, Relation>();
         QSharedPointer<Entity> e;
-        for (int var = classes.size(); var >= 0; --var) {
+        for (int var = classes.size()-1; var >= 0; --var) {
             auto metaObj = classes.at(var);
             e = QSharedPointer<Entity>(EntityInstanceFactory::createInstance(
                                            metaObj->className()));
diff --git a/src/querybuilder.h b/src/querybuilder.h
index 3750b91..45fe5c0 100644
--- a/src/querybuilder.h
+++ b/src/querybuilder.h
@@ -164,7 +164,8 @@ class QueryBuilder {
                      const QString &primaryKey = "id") const;
     QSqlQuery update(const QString &tableName, QHash<QString, QVariant> &attributes,
                      const QString &primaryKey = "id") const;
-    QList<QSqlQuery> createOrMerge(const QSharedPointer<Entity> &entity, bool insert) const;
+    QList<QSqlQuery> createOrMerge(const QSharedPointer<Entity> &entity,
+                                   bool insert) const;
     virtual void createRelationFK(QStringList &queries,
                                   const QSharedPointer<Entity> &entity, const Relation &relation,
                                   const QMetaProperty &metaProperty, const QString &update,