diff --git a/.travis.yml b/.travis.yml index d7bb32e..33819c8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -71,7 +71,7 @@ before_script: - '[[ "$TRAVIS_OS_NAME" != linux || "$PPA" == */opt-* ]] || export QT_SELECT=qt5' - mkdir -p "$TRAVIS_BUILD_DIR-build" - cd "$TRAVIS_BUILD_DIR-build" - - echo 'QT -= gui' >> ""$TRAVIS_BUILD_DIR/ci-test-init.pri" + - echo 'QT -= gui' >> "$TRAVIS_BUILD_DIR/ci-test-init.pri" - qmake -r -Wall -Wlogic -Wparser CONFIG+=debug_and_release "$TRAVIS_BUILD_DIR/nut.pro" script: diff --git a/ci-test-init.pri b/ci-test-init.pri index a24cc9d..7e8ac7a 100644 --- a/ci-test-init.pri +++ b/ci-test-init.pri @@ -1,3 +1,4 @@ #QT -= gui DEFINES += NUT_PATH=\\\"$$PWD/../../\\\" + diff --git a/src/tableset.h b/src/tableset.h index 073ed91..af59311 100644 --- a/src/tableset.h +++ b/src/tableset.h @@ -102,7 +102,7 @@ template Q_OUTOFLINE_TEMPLATE Row TableSet::at(int i) const { #ifdef NUT_SHARED_POINTER - return data->childs.at(i).objectCast(); + return data->childs.at(i).template objectCast(); #else return reinterpret_cast(data->childs.at(i)); #endif @@ -112,7 +112,7 @@ template Q_OUTOFLINE_TEMPLATE const Row TableSet::operator[](int i) const { #ifdef NUT_SHARED_POINTER - return data->childs.at(i).objectCast(); + return data->childs.at(i).template objectCast(); #else return reinterpret_cast(data->childs.at(i)); #endif