291 devicePath = epocRoot() + "epoc32\\winscw\\" + devicePath.remove(1, 1); |
291 devicePath = epocRoot() + "epoc32\\winscw\\" + devicePath.remove(1, 1); |
292 } else { |
292 } else { |
293 devicePath = epocRoot() + "epoc32\\winscw\\c" + devicePath; |
293 devicePath = epocRoot() + "epoc32\\winscw\\c" + devicePath; |
294 } |
294 } |
295 } else { |
295 } else { |
296 //The logic of the calling the initProjectDeploySymbian function depends only |
296 // Drive letter needed if targetpath contains one and it is not already in |
297 //from devicePathHasDriveLetter in pro files. |
|
298 //:QTP:QTPROD-92 Deployment of plugins requires WINSCW build before ARM build |
297 //:QTP:QTPROD-92 Deployment of plugins requires WINSCW build before ARM build |
299 if (!devicePathHasDriveLetter) { |
298 if (targetPathHasDriveLetter && !devicePathHasDriveLetter) { |
300 if (targetPathHasDriveLetter) { |
299 //temporary fix for Raptor building for plugins |
301 // Drive letter needed if targetpath contains one and it is not already in |
300 if (devicePath.indexOf("plugins", Qt::CaseInsensitive) != -1) { |
302 if (devicePath.indexOf("plugins", Qt::CaseInsensitive) != -1 && !platform.compare("armv5") ) { |
301 devicePath = deploymentDrive + "\\epoc32\\data\\z" + devicePath; |
303 //For plugin deployment under ARM no needed drive letter |
302 } else { |
304 devicePath = epocRoot() + "epoc32\\data\\z" + devicePath; |
303 devicePath = deploymentDrive + devicePath; |
305 } else { |
304 } |
306 devicePath = deploymentDrive + devicePath; |
|
307 } |
|
308 } else { |
|
309 // Only deployment for ARM need full path for the deployment |
|
310 if (devicePath.indexOf("plugins", Qt::CaseInsensitive) != -1 && !platform.compare("armv5") ) { |
|
311 devicePath = epocRoot() + "epoc32\\data\\z" + devicePath; |
|
312 } |
|
313 } |
|
314 |
|
315 } else { |
305 } else { |
316 //it is necessary to delete drive letter for ARM deployment |
306 devicePath = epocRoot() + "epoc32\\data\\z" + devicePath; |
317 if (!platform.compare("armv5")) { |
307 } |
318 devicePath.remove(0,2); |
|
319 devicePath = epocRoot() + "epoc32\\data\\z" + devicePath; |
|
320 } |
|
321 } |
|
322 } |
308 } |
323 } |
309 } |
324 |
310 |
325 devicePath.replace(QLatin1String("/"), QLatin1String("\\")); |
311 devicePath.replace(QLatin1String("/"), QLatin1String("\\")); |
326 |
312 |