equal
deleted
inserted
replaced
1 /**************************************************************************** |
1 /**************************************************************************** |
2 ** |
2 ** |
3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). |
3 ** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). |
4 ** All rights reserved. |
4 ** All rights reserved. |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
5 ** Contact: Nokia Corporation (qt-info@nokia.com) |
6 ** |
6 ** |
7 ** This file is part of the qmake application of the Qt Toolkit. |
7 ** This file is part of the qmake application of the Qt Toolkit. |
8 ** |
8 ** |
632 #endif |
632 #endif |
633 } else if(flags & Option::FixPathToTargetSeparators) { |
633 } else if(flags & Option::FixPathToTargetSeparators) { |
634 string = string.replace('/', Option::dir_sep).replace('\\', Option::dir_sep); |
634 string = string.replace('/', Option::dir_sep).replace('\\', Option::dir_sep); |
635 } |
635 } |
636 |
636 |
637 if (string.startsWith("\"") && string.endsWith("\"") || |
637 if ((string.startsWith("\"") && string.endsWith("\"")) || |
638 string.startsWith("\'") && string.endsWith("\'")) |
638 (string.startsWith("\'") && string.endsWith("\'"))) |
639 string = string.mid(1, string.length()-2); |
639 string = string.mid(1, string.length()-2); |
640 |
640 |
641 //cache |
641 //cache |
642 //qDebug() << "Fix" << orig_string << "->" << string; |
642 //qDebug() << "Fix" << orig_string << "->" << string; |
643 cache->insert(cacheKey, string); |
643 cache->insert(cacheKey, string); |