Ignore:
Timestamp:
Feb 11, 2010, 11:19:06 PM (15 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.6.1 sources.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/qmake/generators/unix/unixmake2.cpp

    r2 r561  
    22**
    33** 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])
    56**
    67** This file is part of the qmake application of the Qt Toolkit.
     
    2122** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
    2223**
    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.
    2727**
    2828** GNU General Public License Usage
     
    3434** met: http://www.gnu.org/copyleft/gpl.html.
    3535**
    36 ** If you are unsure which license is appropriate for your use, please
    37 ** contact the sales department at qt-sales@nokia.com.
     36** If you
     37** @nokia.com.
    3838** $QT_END_LICENSE$
    3939**
     
    150150        t << "LFLAGS        = " << var("QMAKE_LFLAGS") << endl;
    151151        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;
    153153    }
    154154
     
    164164    t << "COPY_FILE     = " << var("QMAKE_COPY_FILE") << endl;
    165165    t << "COPY_DIR      = " << var("QMAKE_COPY_DIR") << endl;
     166
    166167    t << "INSTALL_FILE  = " << var("QMAKE_INSTALL_FILE") << endl;
    167168    t << "INSTALL_DIR   = " << var("QMAKE_INSTALL_DIR") << endl;
     
    14241425
    14251426    // 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 one
    1431     }
    1432     libs << "QMAKE_LFLAGS_THREAD"; //not sure about this one, but what about things like -pthread?
    14331427    t << "Libs: ";
    14341428    QString pkgConfiglibDir;
     
    14501444    }
    14511445    t << pkgConfiglibDir << " " << pkgConfiglibName << " " << endl;
     1446
     1447
     1448
     1449
     1450
     1451
     1452
     1453
     1454
    14521455    t << "Libs.private: ";
    14531456    for(QStringList::ConstIterator it = libs.begin(); it != libs.end(); ++it) {
Note: See TracChangeset for help on using the changeset viewer.