Compile fixes

src/plugins/qt4projectmanager/librarydetailscontroller.cpp

@@ -89,8 +89,8 @@ LibraryDetailsController::LibraryDetailsController(
     // if its toolchain is maemo behave the same as we would be on linux
     if (qt4BuildConfiguration
             && qt4BuildConfiguration->toolChain()
-            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
-                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
+            && (qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
+                || qt4BuildConfiguration->toolChain()->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
         m_creatorPlatform = CreatorLinux;
 #endif
 

src/plugins/qt4projectmanager/qmakestep.cpp

@@ -157,8 +157,8 @@ QStringList QMakeStep::moreArguments()
     QStringList arguments;
 #if defined(Q_OS_WIN) || defined(Q_OS_MAC)
     ProjectExplorer::ToolChain *tc = bc->toolChain();
-    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavour
-               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavour))
+    if (tc && (tc->targetAbi().osFlavor() == ProjectExplorer::Abi::HarmattanLinuxFlavor
+               || tc->targetAbi().osFlavor() == ProjectExplorer::Abi::MaemoLinuxFlavor))
         arguments << QLatin1String("-unix");
 #endif
     if (!bc->qtVersion()->supportsShadowBuilds()) {

src/plugins/qt4projectmanager/qtversionmanager.cpp

@@ -1536,7 +1536,7 @@ void QtVersion::updateAbiAndMkspec() const
             QList<ProjectExplorer::Abi> tmp = m_abis;
             m_abis.clear();
             foreach (const ProjectExplorer::Abi &abi, tmp)
-                m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::WindowsMSysFlavour,
+                m_abis.append(ProjectExplorer::Abi(abi.architecture(), abi.os(), ProjectExplorer::Abi::WindowsMSysFlavor,
                                                    abi.binaryFormat(), abi.wordWidth()));
         }
 #endif