newest master

• May 21, 2016 - 14:35

What is the newest master? when I git pull origin master,
I get a commit from April 15th.
96d97653981fe3aa2fd4b44841378d31910e8f63

Is this correct?

One reason I ask is because when I try to compile this I get compilation errors.

CompileC /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.o libmscore/staff.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
cd /Users/jimka/MuseScore
export LANG=en_US.US-ASCII
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-shorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DCMAKE_INTDIR=\"Debug\" -DQT_DISABLE_DEPRECATED_BEFORE=0 -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.7 -g -Wno-sign-conversion -I/Users/jimka/Musescore/build.xcode/libmscore/Debug/include -I/Users/jimka/Musescore/build.xcode/libmscore -I/Users/jimka/Musescore/libmscore -I/Users/jimka/Qt/5.4/clang_64/lib/QtGui.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtCore.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/mkspecs/macx-clang -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWidgets.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtSvg.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtNetwork.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtTest.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtDesigner.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtXml.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtConcurrent.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtXmlPatterns.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/include -I/Users/jimka/Qt/5.4/clang_64/include/QtUiTools -I/Users/jimka/Qt/5.4/clang_64/lib/QtQml.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtQuick.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtQuickWidgets.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtSql.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtOpenGL.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtHelp.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWebEngine.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWebEngineWidgets.framework/Headers -I/Users/jimka/Musescore -I/Users/jimka/Musescore/build.xcode -I/opt/local/include -I/Users/jimka/Musescore/thirdparty/freetype/include -I/Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/DerivedSources/x86_64 -I/Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/DerivedSources -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -F/Users/jimka/Musescore/build.xcode/libmscore/Debug -F/Users/jimka/Qt/5.4/clang_64/lib -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override -Wall -Wextra -Winvalid-pch -include /var/folders/rf/5n_0m5j52x71hffg59b_y3kw0000gn/C/com.apple.DeveloperTools/7.3.1-7D1014/Xcode/SharedPrecompiledHeaders/all-fpjvinzpohytjrezhqpknmvybpeo/all.h -MMD -MT dependencies -MF /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.d --serialize-diagnostics /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.dia -c /Users/jimka/MuseScore/libmscore/staff.cpp -o /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.o

In file included from /Users/jimka/MuseScore/libmscore/staff.cpp:18:
In file included from /Users/jimka/Musescore/libmscore/score.h:26:
/Users/jimka/Musescore/libmscore/segment.h:220:20: warning: 'Ms::Segment::shape' hides overloaded virtual function [-Woverloaded-virtual]
const Shape& shape(int i) const { return _shapes[i]; }
^
In file included from /Users/jimka/MuseScore/libmscore/staff.cpp:14:
In file included from /Users/jimka/Musescore/libmscore/staff.h:24:
In file included from /Users/jimka/Musescore/libmscore/cleflist.h:17:
In file included from /Users/jimka/Musescore/libmscore/clef.h:21:
/Users/jimka/Musescore/libmscore/element.h:406:21: note: hidden overloaded virtual function 'Ms::Element::shape' declared here: different number of parameters (0 vs 1)
virtual Shape shape() const;
^
In file included from /Users/jimka/MuseScore/libmscore/staff.cpp:18:
In file included from /Users/jimka/Musescore/libmscore/score.h:26:
/Users/jimka/Musescore/libmscore/segment.h:221:14: warning: 'Ms::Segment::shape' hides overloaded virtual function [-Woverloaded-virtual]
Shape& shape(int i) { return _shapes[i]; }
^
In file included from /Users/jimka/MuseScore/libmscore/staff.cpp:14:
In file included from /Users/jimka/Musescore/libmscore/staff.h:24:
In file included from /Users/jimka/Musescore/libmscore/cleflist.h:17:
In file included from /Users/jimka/Musescore/libmscore/clef.h:21:
/Users/jimka/Musescore/libmscore/element.h:406:21: note: hidden overloaded virtual function 'Ms::Element::shape' declared here: different number of parameters (0 vs 1)
virtual Shape shape() const;
^
/Users/jimka/MuseScore/libmscore/staff.cpp:533:19: error: use of undeclared identifier 'qInfo'
qInfo("bad _barLineSpan %d for staff %d (nstaves %d)",
^
2 warnings and 1 error generated.


Comments

In reply to by Fyrult

So even with the newest I get the same compilation error.
Looks like maybe the wrong QT is being used? Could this be?

CompileC /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.o libmscore/staff.cpp normal x86_64 c++ com.apple.compilers.llvm.clang.1_0.compiler
cd /Users/jimka/MuseScore
export LANG=en_US.US-ASCII
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang -x c++ -arch x86_64 -fmessage-length=0 -fdiagnostics-show-note-include-stack -fmacro-backtrace-limit=0 -Wno-trigraphs -fpascal-strings -O0 -Wno-missing-field-initializers -Wno-missing-prototypes -Wno-return-type -Wno-non-virtual-dtor -Wno-overloaded-virtual -Wno-exit-time-destructors -Wno-missing-braces -Wparentheses -Wswitch -Wno-unused-function -Wno-unused-label -Wno-unused-parameter -Wno-unused-variable -Wunused-value -Wno-empty-body -Wno-uninitialized -Wno-unknown-pragmas -Wno-shadow -Wno-four-char-constants -Wno-conversion -Wno-constant-conversion -Wno-int-conversion -Wno-bool-conversion -Wno-enum-conversion -Wno-shorten-64-to-32 -Wno-newline-eof -Wno-c++11-extensions -DCMAKE_INTDIR=\"Debug\" -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk -fasm-blocks -fstrict-aliasing -Wdeprecated-declarations -Winvalid-offsetof -mmacosx-version-min=10.7 -g -Wno-sign-conversion -I/Users/jimka/Musescore/build.xcode/libmscore/Debug/include -I/Users/jimka/Musescore/build.xcode/libmscore -I/Users/jimka/Musescore/libmscore -I/Users/jimka/Qt/5.4/clang_64/lib/QtCore.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/mkspecs/macx-clang -I/Users/jimka/Qt/5.4/clang_64/lib/QtGui.framework/Headers -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.11.sdk/System/Library/Frameworks/OpenGL.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtDesigner.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWidgets.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtXml.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtNetwork.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtTest.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtQml.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtQuick.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtQuickWidgets.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtXmlPatterns.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtSvg.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtSql.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtPrintSupport.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtConcurrent.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/include -I/Users/jimka/Qt/5.4/clang_64/include/QtUiTools -I/Users/jimka/Qt/5.4/clang_64/lib/QtOpenGL.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtHelp.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWebEngine.framework/Headers -I/Users/jimka/Qt/5.4/clang_64/lib/QtWebEngineWidgets.framework/Headers -I/Users/jimka/Musescore -I/Users/jimka/Musescore/build.xcode -I/opt/local/include -I/Users/jimka/Musescore/thirdparty/freetype/include -I/Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/DerivedSources/x86_64 -I/Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/DerivedSources -Wmost -Wno-four-char-constants -Wno-unknown-pragmas -F/Users/jimka/Musescore/build.xcode/libmscore/Debug -F/Users/jimka/Qt/5.4/clang_64/lib -std=c++11 -fPIC -stdlib=libc++ -Wno-inconsistent-missing-override -Wall -Wextra -Winvalid-pch -include /var/folders/rf/5n_0m5j52x71hffg59b_y3kw0000gn/C/com.apple.DeveloperTools/7.3.1-7D1014/Xcode/SharedPrecompiledHeaders/all-dcsvmanecaecppbzafthbzsqmrog/all.h -MMD -MT dependencies -MF /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.d --serialize-diagnostics /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.dia -c /Users/jimka/MuseScore/libmscore/staff.cpp -o /Users/jimka/Musescore/build.xcode/libmscore/mscore.build/Debug/libmscore.build/Objects-normal/x86_64/staff.o

/Users/jimka/MuseScore/libmscore/staff.cpp:533:19: error: use of undeclared identifier 'qInfo'
qInfo("bad _barLineSpan %d for staff %d (nstaves %d)",
^
1 error generated.

Do you still have an unanswered question? Please log in first to post your question.