Changeset 561 for trunk/qmake/generators/unix/unixmake2.cpp
- Timestamp:
- Feb 11, 2010, 11:19:06 PM (15 years ago)
- Location:
- trunk
- Files:
-
- 2 edited
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/unix/unixmake2.cpp
r2 r561 2 2 ** 3 3 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). 4 ** Contact: Qt Software Information ([email protected]) 4 ** All rights reserved. 5 ** Contact: Nokia Corporation ([email protected]) 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 37 ** @nokia.com. 38 38 ** $QT_END_LICENSE$ 39 39 ** … … 150 150 t << "LFLAGS = " << var("QMAKE_LFLAGS") << endl; 151 151 t << "LIBS = " << "$(SUBLIBS) " << var("QMAKE_FRAMEWORKDIR_FLAGS") << " " 152 << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl;152 << var("QMAKE_LIBDIR_FLAGS") << " " << var("QMAKE_LIBS") << endl; 153 153 } 154 154 … … 164 164 t << "COPY_FILE = " << var("QMAKE_COPY_FILE") << endl; 165 165 t << "COPY_DIR = " << var("QMAKE_COPY_DIR") << endl; 166 166 167 t << "INSTALL_FILE = " << var("QMAKE_INSTALL_FILE") << endl; 167 168 t << "INSTALL_DIR = " << var("QMAKE_INSTALL_DIR") << endl; … … 1424 1425 1425 1426 // libs 1426 QStringList libs;1427 if(!project->isEmpty("QMAKE_INTERNAL_PRL_LIBS")) {1428 libs = project->values("QMAKE_INTERNAL_PRL_LIBS");1429 } else {1430 libs << "QMAKE_LIBS"; //obvious one1431 }1432 libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?1433 1427 t << "Libs: "; 1434 1428 QString pkgConfiglibDir; … … 1450 1444 } 1451 1445 t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl; 1446 1447 1448 1449 1450 1451 1452 1453 1454 1452 1455 t << "Libs.private: "; 1453 1456 for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {
Note:
See TracChangeset
for help on using the changeset viewer.