Merge branch 'master' of https://github.com/highfidelity/hifi into fix/skybox

interface/src/Application.cpp

@@ -737,6 +737,8 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer) :
                 case Action::UI_NAV_SELECT:
                     key = Qt::Key_Return;
                     break;
+                default:
+                    break;
             }
 
             if (navAxis) {

interface/src/avatar/Avatar.cpp

@@ -585,7 +585,7 @@ bool Avatar::shouldRenderHead(const RenderArgs* renderArgs) const {
 
 // virtual
 void Avatar::simulateAttachments(float deltaTime) {
-    for (int i = 0; i < _attachmentModels.size(); i++) {
+    for (int i = 0; i < (int)_attachmentModels.size(); i++) {
         const AttachmentData& attachment = _attachmentData.at(i);
         auto& model = _attachmentModels.at(i);
         int jointIndex = getJointIndex(attachment.jointName);
@@ -949,14 +949,14 @@ void Avatar::setAttachmentData(const QVector<AttachmentData>& attachmentData) {
     AvatarData::setAttachmentData(attachmentData);
 
     // if number of attachments has been reduced, remove excess models.
-    while (_attachmentModels.size() > attachmentData.size()) {
+    while ((int)_attachmentModels.size() > attachmentData.size()) {
         auto attachmentModel = _attachmentModels.back();
         _attachmentModels.pop_back();
         _attachmentsToRemove.push_back(attachmentModel);
     }
 
     for (int i = 0; i < attachmentData.size(); i++) {
-        if (i == _attachmentModels.size()) {
+        if (i == (int)_attachmentModels.size()) {
             // if number of attachments has been increased, we need to allocate a new model
             _attachmentModels.push_back(allocateAttachmentModel(attachmentData[i].isSoft, _skeletonModel.getRig()));
         }

libraries/entities/src/EntityItem.h

@@ -56,6 +56,7 @@ namespace render {
 #define debugTimeOnly(T) qPrintable(QString("%1").arg(T, 16, 10))
 #define debugTreeVector(V) V << "[" << V << " in meters ]"
 
+
 /// EntityItem class this is the base class for all entity types. It handles the basic properties and functionality available
 /// to all other entity types. In particular: postion, size, rotation, age, lifetime, velocity, gravity. You can not instantiate
 /// one directly, instead you must only construct one of it's derived classes with additional features.

libraries/ui/src/QmlWindowClass.cpp

@@ -90,7 +90,6 @@ QScriptValue QmlWindowClass::internalConstructor(const QString& qmlSource,
     QString url;
     QString title;
     int width = 100, height = 100;
-    bool isToolWindow = false;
     bool visible = true;
     if (argumentCount > 1) {
 

stack-manager/src/AppDelegate.cpp

@@ -77,6 +77,8 @@ void myMessageHandler(QtMsgType type, const QMessageLogContext &context, const Q
             fprintf(stdout, "Fatal: %s\n", qPrintable(msg));
             txt += msg;
             break;
+        default:
+            break;
     }
 
     if (outStream) {