summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorPierre Rossi <pierre.rossi@digia.com>2012-10-02 19:22:17 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-08 17:14:24 +0200
commitf71170aa35ad37fdee2def64c72c60806f92d00d (patch)
treed66673e0f6a6c0082a71a692d59842a34128d96a /qmake
parente0b5571b5348711bbcc19f58455aa69c41b5fe30 (diff)
Tools: add QLibraryInfo to the bootstrapped library.
For future use by qdoc. Change-Id: Id9079a6fa581ff16810df9a8f2bb94314ee11ca9 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'qmake')
-rw-r--r--qmake/option.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp
index 561df8eebd..91c154ab6c 100644
--- a/qmake/option.cpp
+++ b/qmake/option.cpp
@@ -645,7 +645,7 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data)
cache_items.append(new QMakeCacheClearItem(func, data));
}
-QString qmake_libraryInfoFile()
+QString qt_libraryInfoFile()
{
if (!Option::globals->qmake_abslocation.isEmpty())
return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf");