Fixed merge conflict

deploy/qgroundcontrol_installer.nsi

+Name "QGroundcontrol"
+
+OutFile "qgroundcontrol-installer-win32.exe"
+
+InstallDir $PROGRAMFILES\qgroundcontrol
+
+Page license 
+Page directory
+Page components
+Page instfiles
+UninstPage uninstConfirm
+UninstPage instfiles
+
+LicenseData ..\license.txt
+
+Section ""
+
+  SetOutPath $INSTDIR
+  File qgroundcontrol\*.*
+  WriteUninstaller $INSTDIR\QGroundcontrol_uninstall.exe
+SectionEnd 
+
+Section "Uninstall"
+  Delete $INSTDIR\QGroundcontrol_uninstall.exe
+  Delete $INSTDIR\*.*
+  RMDir $INSTDIR
+  Delete "$SMPROGRAMS\QGroundcontrol\*.*"
+  RMDir "$SMPROGRAMS\QGroundcontrol\"
+SectionEnd
+
+Section "create Start Menu Shortcuts"
+  CreateDirectory "$SMPROGRAMS\QGroundcontrol"
+  CreateShortCut "$SMPROGRAMS\QGroundcontrol\uninstall.lnk" "$INSTDIR\QGroundcontrol_uninstall.exe" "" "$INSTDIR\QGroundcontrol_uninstall.exe" 0
+  CreateShortCut "$SMPROGRAMS\QGroundcontrol\QGroundcontrol.lnk" "$INSTDIR\qgroundcontrol.exe" "" "$INSTDIR\qgroundcontrol.exe" 0
+SectionEnd
\ No newline at end of file

qgroundcontrol.pri

@@ -146,6 +146,7 @@ win32 {
         DESTDIR = $$BASEDIR/bin
     }
         
+    RC_FILE = $$BASEDIR/qgroundcontrol.rc
 }
 
 

qgroundcontrol.rc

+IDI_ICON1               ICON    DISCARDABLE     "images/icons/qgroundcontrol.ico"
\ No newline at end of file

src/comm/MAVLinkXMLParser.cc

@@ -255,7 +255,7 @@ bool MAVLinkXMLParser::generate()
     QString messagesDirName = "generated";
     QDir dir(outputDirName + "/" + messagesDirName);
     // Create directory if it doesn't exist, report result in success
-    if (!dir.exists()) success = success && dir.mkdir(outputDirName);
+    if (!dir.exists()) success = success && dir.mkpath(outputDirName + "/" + messagesDirName);
     for (int i = 0; i < cFiles.size(); i++)
     {
         QFile rawFile(dir.filePath(cFiles.at(i).first));