Changeset 561 for trunk/qmake/generators/win32
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (16 years ago)
- Location:
- trunk
- Files:
-
- 15 edited
-
. (modified) (1 prop)
-
qmake/generators/win32/borland_bmake.cpp (modified) (3 diffs)
-
qmake/generators/win32/borland_bmake.h (modified) (3 diffs)
-
qmake/generators/win32/mingw_make.cpp (modified) (6 diffs)
-
qmake/generators/win32/mingw_make.h (modified) (4 diffs)
-
qmake/generators/win32/msvc_dsp.cpp (modified) (4 diffs)
-
qmake/generators/win32/msvc_dsp.h (modified) (3 diffs)
-
qmake/generators/win32/msvc_nmake.cpp (modified) (4 diffs)
-
qmake/generators/win32/msvc_nmake.h (modified) (3 diffs)
-
qmake/generators/win32/msvc_objectmodel.cpp (modified) (13 diffs)
-
qmake/generators/win32/msvc_objectmodel.h (modified) (4 diffs)
-
qmake/generators/win32/msvc_vcproj.cpp (modified) (18 diffs)
-
qmake/generators/win32/msvc_vcproj.h (modified) (3 diffs)
-
qmake/generators/win32/winmakefile.cpp (modified) (6 diffs)
-
qmake/generators/win32/winmakefile.h (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk
-
Property svn:mergeinfo
set to (toggle deleted branches)
/branches/vendor/nokia/qt/4.6.1 merged eligible /branches/vendor/nokia/qt/current merged eligible /branches/vendor/trolltech/qt/current 3-149
-
Property svn:mergeinfo
set to (toggle deleted branches)
-
trunk/qmake/generators/win32/borland_bmake.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** -
trunk/qmake/generators/win32/borland_bmake.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** -
trunk/qmake/generators/win32/mingw_make.cpp
r29 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 83 83 bool MingwMakefileGenerator::findLibraries() 84 84 { 85 QStringList &l = project->values("QMAKE_LIBS"); 85 return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE"); 86 } 87 88 bool MingwMakefileGenerator::findLibraries(const QString &where) 89 { 90 QStringList &l = project->values(where); 86 91 87 92 QList<QMakeLocalFileName> dirs; … … 259 264 // LIBS defined in Profile comes first for gcc 260 265 project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); 266 project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); 261 267 262 268 QString targetfilename = project->values("TARGET").first(); … … 345 351 if(!project->values("QMAKE_LIBDIR").isEmpty()) 346 352 writeLibDirPart(t); 347 t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << endl; 353 t << var("QMAKE_LIBS").replace(QRegExp("(\\slib|^lib)")," -l") << ' ' 354 << var("QMAKE_LIBS_PRIVATE").replace(QRegExp("(\\slib|^lib)")," -l") << endl; 348 355 } 349 356 } -
trunk/qmake/generators/win32/mingw_make.h
r29 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 73 73 74 74 virtual bool findLibraries(); 75 bool findLibraries(const QString &where); 75 76 void fixTargetExt(); 76 77 -
trunk/qmake/generators/win32/msvc_dsp.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 683 683 if(!profile.endsWith(Option::dir_sep)) 684 684 profile += Option::dir_sep; 685 profile += fi.baseName() + ".pro";685 profile += fi.baseName() + Option::pro_ext; 686 686 subdirs.append(profile); 687 687 } else { -
trunk/qmake/generators/win32/msvc_dsp.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** -
trunk/qmake/generators/win32/msvc_nmake.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 173 173 174 174 project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); 175 project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); 175 176 processVars(); 176 177 -
trunk/qmake/generators/win32/msvc_nmake.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** -
trunk/qmake/generators/win32/msvc_objectmodel.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 50 50 const char _Configuration[] = "Configuration"; 51 51 const char _Configurations[] = "Configurations"; 52 const char _File[] = "File";52 const char q_File[] = "File"; 53 53 const char _FileConfiguration[] = "FileConfiguration"; 54 const char _Files[] = "Files";54 const char q_Files[] = "Files"; 55 55 const char _Filter[] = "Filter"; 56 56 const char _Globals[] = "Globals"; … … 485 485 if (opt.contains('a') && !opt.contains('s') && !opt.contains('c')) 486 486 ExceptionHandling = ehSEH; 487 else if (!opt.contains('a') && opt.contains("s-") && opt.contains("c-")) 487 else if (!opt.contains('a') && opt.contains("s-") && opt.contains("c-")) 488 488 ExceptionHandling = ehNone; 489 489 else if (!opt.contains('a') && opt.contains('s') && opt.contains('c')) … … 1395 1395 TargetMachine = machineX86; 1396 1396 break; 1397 case 0x0005b94: // X64 1398 TargetMachine = machineX64; 1399 break; 1397 1400 // so we put the others in AdditionalOptions... 1398 case 0x0005b94: // X641399 1401 case 0x0046063: // AM33 1400 1402 case 0x000466d: // ARM … … 2382 2384 for (int i = 0; i < tool.Files.count(); ++i) { 2383 2385 const VCFilterFile &info = tool.Files.at(i); 2384 xml << tag( _File)2386 xml << tag(q_File) 2385 2387 << attrS(_RelativePath, Option::fixPathToLocalOS(info.file)) 2386 2388 << data(); // In case no custom builds, to avoid "/>" endings 2387 2389 tool.outputFileConfig(xml, tool.Files.at(i).file); 2388 xml << closetag( _File);2390 xml << closetag(q_File); 2389 2391 } 2390 2392 if (!tool.Name.isEmpty()) … … 2422 2424 << tool.Configuration; 2423 2425 xml << closetag(_Configurations) 2424 << tag( _Files);2426 << tag(q_Files); 2425 2427 // Add this configuration into a multi-config project, since that's where we have the flat/tree 2426 2428 // XML output functionality … … 2438 2440 } 2439 2441 tempProj.outputFilter(xml, "RootFiles"); 2440 xml << closetag( _Files)2442 xml << closetag(q_Files) 2441 2443 << tag(_Globals) 2442 2444 << data(); // No "/>" end tag … … 2493 2495 const QString &filtername) 2494 2496 { 2495 xml << tag( _File)2497 xml << tag(q_File) 2496 2498 << attrS(_RelativePath, Option::fixPathToLocalOS(info.file)); 2497 2499 for (int i = 0; i < SingleProjects.count(); ++i) { … … 2521 2523 filter.outputFileConfig(xml, info.file); 2522 2524 } 2523 xml << closetag( _File);2525 xml << closetag(q_File); 2524 2526 } 2525 2527 … … 2616 2618 xml << tool.SingleProjects.at(i).Configuration; 2617 2619 xml << closetag(_Configurations) 2618 << tag( _Files);2620 << tag(q_Files); 2619 2621 tool.outputFilter(xml, "Sources"); 2620 2622 tool.outputFilter(xml, "Headers"); … … 2628 2630 } 2629 2631 tool.outputFilter(xml, "RootFiles"); 2630 xml << closetag( _Files)2632 xml << closetag(q_Files) 2631 2633 << tag(_Globals) 2632 2634 << data(); // No "/>" end tag -
trunk/qmake/generators/win32/msvc_objectmodel.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 299 299 enum machineTypeOption { 300 300 machineNotSet, 301 machineX86 301 machineX86, 302 machineX64 = 17 302 303 }; 303 304 enum midlCharOption { -
trunk/qmake/generators/win32/msvc_vcproj.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 121 121 122 122 HKEY handle = 0; 123 LONG res; 124 QT_WA( { 125 res = RegOpenKeyExW(parentHandle, (WCHAR*)rSubkeyPath.utf16(), 126 0, KEY_READ, &handle); 127 } , { 128 res = RegOpenKeyExA(parentHandle, rSubkeyPath.toLocal8Bit(), 129 0, KEY_READ, &handle); 130 } ); 123 LONG res = RegOpenKeyEx(parentHandle, (wchar_t*)rSubkeyPath.utf16(), 0, KEY_READ, &handle); 131 124 132 125 if (res != ERROR_SUCCESS) … … 136 129 DWORD dataType; 137 130 DWORD dataSize; 138 QT_WA( { 139 res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize); 140 }, { 141 res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, &dataType, 0, &dataSize); 142 } ); 131 res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, &dataType, 0, &dataSize); 143 132 if (res != ERROR_SUCCESS) { 144 133 RegCloseKey(handle); … … 148 137 // get the value 149 138 QByteArray data(dataSize, 0); 150 QT_WA( { 151 res = RegQueryValueExW(handle, (WCHAR*)rSubkeyName.utf16(), 0, 0, 152 reinterpret_cast<unsigned char*>(data.data()), &dataSize); 153 }, { 154 res = RegQueryValueExA(handle, rSubkeyName.toLocal8Bit(), 0, 0, 155 reinterpret_cast<unsigned char*>(data.data()), &dataSize); 156 } ); 139 res = RegQueryValueEx(handle, (wchar_t*)rSubkeyName.utf16(), 0, 0, 140 reinterpret_cast<unsigned char*>(data.data()), &dataSize); 157 141 if (res != ERROR_SUCCESS) { 158 142 RegCloseKey(handle); … … 164 148 case REG_EXPAND_SZ: 165 149 case REG_SZ: { 166 QT_WA( { 167 result = QString::fromUtf16(((const ushort*)data.constData())); 168 }, { 169 result = QString::fromLatin1(data.constData()); 170 } ); 150 result = QString::fromWCharArray(((const wchar_t *)data.constData())); 171 151 break; 172 152 } … … 176 156 int i = 0; 177 157 for (;;) { 178 QString s; 179 QT_WA( { 180 s = QString::fromUtf16((const ushort*)data.constData() + i); 181 }, { 182 s = QString::fromLatin1(data.constData() + i); 183 } ); 158 QString s = QString::fromWCharArray((const wchar_t *)data.constData() + i); 184 159 i += s.length() + 1; 185 160 … … 194 169 case REG_NONE: 195 170 case REG_BINARY: { 196 QT_WA( { 197 result = QString::fromUtf16((const ushort*)data.constData(), data.size()/2); 198 }, { 199 result = QString::fromLatin1(data.constData(), data.size()); 200 } ); 171 result = QString::fromWCharArray((const wchar_t *)data.constData(), data.size() / 2); 201 172 break; 202 173 } … … 525 496 if(!profile.endsWith(Option::dir_sep)) 526 497 profile += Option::dir_sep; 527 profile += fi.baseName() + ".pro";498 profile += fi.baseName() + Option::pro_ext; 528 499 subdirs.append(profile); 529 500 } else { … … 575 546 576 547 // We assume project filename is [QMAKE_ORIG_TARGET].vcproj 577 QString vcproj = unescapeFilePath( fixFilename(tmp_vcproj.project->first("QMAKE_ORIG_TARGET")) + project->first("VCPROJ_EXTENSION"));548 QString vcproj = unescapeFilePath(tmp_vcproj.project->first("QMAKE_ORIG_TARGET") + project->first("VCPROJ_EXTENSION")); 578 549 QString vcprojDir = qmake_getpwd(); 579 550 … … 653 624 654 625 // Add all unknown libs to the deps 655 QStringList where ("QMAKE_LIBS");626 QStringList where = QStringList() << "QMAKE_LIBS" << "QMAKE_LIBS_PRIVATE"; 656 627 if(!tmp_proj.isEmpty("QMAKE_INTERNAL_PRL_LIBS")) 657 628 where = tmp_proj.variables()["QMAKE_INTERNAL_PRL_LIBS"]; … … 1031 1002 if(project->isActiveConfig("debug")){ 1032 1003 // Debug version 1033 conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));1034 1004 conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_DEBUG")); 1035 1005 if((projectTarget == Application) || (projectTarget == StaticLib)) … … 1039 1009 } else { 1040 1010 // Release version 1041 conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS"));1042 1011 conf.compiler.parseOptions(project->values("QMAKE_CXXFLAGS_RELEASE")); 1043 1012 conf.compiler.PreprocessorDefinitions += "QT_NO_DEBUG"; … … 1204 1173 targetPath = QString("%CSIDL_PROGRAM_FILES%\\") + project->first("TARGET"); 1205 1174 if (targetPath.endsWith("/") || targetPath.endsWith("\\")) 1206 targetPath = targetPath.mid(0,targetPath.size()-1);1175 targetPath.chop(1); 1207 1176 1208 1177 // Only deploy Qt libs for shared build … … 1271 1240 // get item.path 1272 1241 QString devicePath = project->first(item + ".path"); 1273 // if the path does not exist, skip it1274 1242 if (devicePath.isEmpty()) 1275 continue;1243 devicePath = targetPath; 1276 1244 // check if item.path is relative (! either /,\ or %) 1277 1245 if (!(devicePath.at(0) == QLatin1Char('/') … … 1583 1551 1584 1552 project->values("QMAKE_LIBS") += escapeFilePaths(project->values("LIBS")); 1553 project->values("QMAKE_LIBS_PRIVATE") += escapeFilePaths(project->values("LIBS_PRIVATE")); 1585 1554 1586 1555 // Get filename w/o extension ----------------------------------- … … 1626 1595 // $$QMAKE.. -> $$MSVCPROJ.. ------------------------------------- 1627 1596 project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS"); 1597 project->values("MSVCPROJ_LIBS") += project->values("QMAKE_LIBS_PRIVATE"); 1628 1598 project->values("MSVCPROJ_LFLAGS") += project->values("QMAKE_LFLAGS"); 1629 1599 if(!project->values("QMAKE_LIBDIR").isEmpty()) { -
trunk/qmake/generators/win32/msvc_vcproj.h
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** -
trunk/qmake/generators/win32/winmakefile.cpp
r547 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 433 433 rcFile.close(); 434 434 } 435 if (writeRcFile && rcFile.open(QFile::WriteOnly)) { 436 rcFile.write(rcString); 437 rcFile.close(); 435 if (writeRcFile) { 436 bool ok; 437 ok = rcFile.open(QFile::WriteOnly); 438 if (!ok) { 439 // The file can't be opened... try creating the containing 440 // directory first (needed for clean shadow builds) 441 QDir().mkpath(QFileInfo(rcFile).path()); 442 ok = rcFile.open(QFile::WriteOnly); 443 } 444 if (!ok) { 445 ::fprintf(stderr, "Cannot open for writing: %s", rcFile.fileName().toLatin1().constData()); 446 ::exit(1); 447 } 448 rcFile.write(rcString); 449 rcFile.close(); 438 450 } 439 451 if (project->values("QMAKE_WRITE_DEFAULT_RC").isEmpty()) … … 625 637 QString orgDestDir = var("DESTDIR"); 626 638 QString destDir = Option::fixPathToTargetOS(orgDestDir, false); 627 if ( orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep))639 if (!destDir.isEmpty() && (orgDestDir.endsWith('/') || orgDestDir.endsWith(Option::dir_sep))) 628 640 destDir += Option::dir_sep; 629 641 QString target = project->first("TARGET_SHORT"); … … 711 723 writeLibDirPart(t); 712 724 t << var("QMAKE_LFLAGS") << endl; 713 t << "LIBS = " << var("QMAKE_LIBS") << endl;725 t << "LIBS = " << var("QMAKE_LIBS") << " " << var("QMAKE_LIBS_PRIVATE") << endl; 714 726 } 715 727 } -
trunk/qmake/generators/win32/winmakefile.h
r38 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information (qt-info@nokia.com) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation (qt-info@nokia.com) 5 6 ** 6 7 ** This file is part of the qmake application of the Qt Toolkit. … … 21 22 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. 22 23 ** 23 ** In addition, as a special exception, Nokia gives you certain 24 ** additional rights. These rights are described in the Nokia Qt LGPL 25 ** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this 26 ** package. 24 ** In addition, as a special exception, Nokia gives you certain additional 25 ** rights. These rights are described in the Nokia Qt LGPL Exception 26 ** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. 27 27 ** 28 28 ** GNU General Public License Usage … … 34 34 ** met: http://www.gnu.org/copyleft/gpl.html. 35 35 ** 36 ** If you are unsure which license is appropriate for your use, please37 ** contact the sales department at qt-sales@nokia.com.36 ** If you have questions regarding the use of this file, please contact 37 ** Nokia at qt-info@nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 91 91 92 92 inline bool Win32MakefileGenerator::findLibraries() 93 { return findLibraries("QMAKE_LIBS") ; }93 { return findLibraries("QMAKE_LIBS") && findLibraries("QMAKE_LIBS_PRIVATE"); } 94 94 95 95 QT_END_NAMESPACE
Note:
See TracChangeset
for help on using the changeset viewer.
