From 9a75b154bf0732aa3a501b6e31e566e06c5f8a31 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 2 Mar 2012 02:11:59 -0600 Subject: Undo prior accidental commit --- qmake/project.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'qmake/project.cpp') 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