diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-01-22 12:20:19 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2015-02-02 11:14:25 +0000 |
| commit | 44fca87241e457bcb7f7ebd81eb7ae6d7b7f7868 (patch) | |
| tree | 4a681ce35f73d13150b366fd4b4c3ddefcd332f4 /qmake | |
| parent | 8e98a07b306b45c6a86a237a03bc368074629e35 (diff) | |
complete reversal of adding QLibraryInfo to the bootstrap library
amends 684028a64.
Change-Id: I8dcc4b74c4c0328c07711cd7253ff19a74ea2fbf
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/option.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/option.cpp b/qmake/option.cpp index 5af9b100a0..4fcf0d7bdb 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -636,7 +636,7 @@ qmakeAddCacheClear(qmakeCacheClearFunc func, void **data) cache_items.append(new QMakeCacheClearItem(func, data)); } -QString qt_libraryInfoFile() +QString qmake_libraryInfoFile() { if (!Option::globals->qmake_abslocation.isEmpty()) return QDir(QFileInfo(Option::globals->qmake_abslocation).absolutePath()).filePath("qt.conf"); |