diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-03-02 02:11:59 -0600 |
| commit | 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch) | |
| tree | df1e10cc7504665622d096f9ba80dc9e56f3afb8 /qmake/project.cpp | |
| parent | a830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff) | |
| download | qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip | |
Undo prior accidental commit
Diffstat (limited to 'qmake/project.cpp')
| -rw-r--r-- | qmake/project.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/qmake/project.cpp b/qmake/project.cpp index 75e8e0e..efc465d 100644 --- a/qmake/project.cpp +++ b/qmake/project.cpp @@ -90,19 +90,19 @@ QStringList qmake_mkspec_paths() ret << (QT_INSTALL_PREFIX + concat); #endif #if defined(HAVE_QCONFIG_CPP) - ret << (tqInstallPath() + concat); + ret << (qInstallPath() + concat); #endif #ifdef QT_INSTALL_DATA ret << (QT_INSTALL_DATA + concat); #endif #if defined(HAVE_QCONFIG_CPP) - ret << (tqInstallPathData() + concat); + ret << (qInstallPathData() + concat); #endif /* prefer $QTDIR if it is set */ if (getenv("QTDIR")) ret << getenv("QTDIR"); - ret << tqInstallPathData(); + ret << qInstallPathData(); return ret; } @@ -931,13 +931,13 @@ QMakeProject::doProjectTest(const QString& func, QStringList args, QMap<QString, feature_roots << (QT_INSTALL_PREFIX + concat); #endif #if defined(HAVE_QCONFIG_CPP) - feature_roots << (tqInstallPath() + concat); + feature_roots << (qInstallPath() + concat); #endif #ifdef QT_INSTALL_DATA feature_roots << (QT_INSTALL_DATA + concat); #endif #if defined(HAVE_QCONFIG_CPP) - feature_roots << (tqInstallPathData() + concat); + feature_roots << (qInstallPathData() + concat); #endif for(QStringList::Iterator it = feature_roots.begin(); it != feature_roots.end(); ++it) { QString prf = (*it) + QDir::separator() + file; |