diff options
author | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
---|---|---|
committer | axis <qt-info@nokia.com> | 2009-06-29 12:25:09 (GMT) |
commit | 1a8c89e9eaec05e9f38eae4fbc007d8344015de3 (patch) | |
tree | d87e517cfab9443926841b3ef92ca715a717f54a /qmake/project.cpp | |
parent | 78166d5235a5045fdc887febe01d789cac333bb3 (diff) | |
parent | b6171cfbe3b1453a2c46f78db0df4819e4e5e54f (diff) | |
download | Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.zip Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.gz Qt-1a8c89e9eaec05e9f38eae4fbc007d8344015de3.tar.bz2 |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
.gitignore
src/gui/dialogs/qfiledialog_p.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/text/qfontdatabase.cpp
tests/auto/network-settings.h
tests/auto/qitemdelegate/tst_qitemdelegate.cpp
Diffstat (limited to 'qmake/project.cpp')
-rw-r--r-- | qmake/project.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 7cd4c08..593e0b7 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -1,7 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) +** Contact: Nokia Corporation (qt-info@nokia.com) ** ** This file is part of the qmake application of the Qt Toolkit. ** @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. +** contact the sales department at http://www.qtsoftware.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -241,14 +241,6 @@ static QScriptValue qscript_projectWrapper(QScriptEngine *eng, QMakeProject *pro return ret; } -static QScriptValue qscript_toArray(QScriptEngine *eng, const QStringList &elts) -{ - QScriptValue a = eng->newArray(); - for (int i = 0; i < elts.count(); ++i) - a.setProperty(i, QScriptValue(eng, elts.at(i))); - return a; -} - QT_END_NAMESPACE #endif |