Reviewing merge request #5: Fix linkage of the tests
Without this, I get
g++ [...] -o tst_qml3d tst_qml3d.o [...] -lQtTest -lQtDeclarative \
-lQtOpenGL -lQtGui -lQtNetwork -lQtCore -lGLU -lGL -lpthread
[...]/libQtDeclarative.so: undefined reference to
`QScriptDeclarativeClass::startsWithUpper(void* const&)'
collect2: ld returned 1 exit status
when trying to build Qt3D
Commits that would be merged:
Fetching commit diffs…

Showing
Showing 535a374-05626ce
How to apply this merge request to your repository
One way to merge in these changes is to pull them into a local
branch for review, verifying the changes and then merge to back
to master.
# Check out a new branch for integration
git checkout -b merge-requests/5
# Fetch the merge request into this branch
git pull \
git://gitorious.org/qt-labs/qt3d.git \
refs/merge-requests/5
# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/5
# To apply the changes to your branch:
git checkout master
git merge merge-requests/5
git push origin master
Add a new comment:
Login or create an account to post a comment