diff options
| author | Friedemann Kleint <Friedemann.Kleint@digia.com> | 2012-11-01 14:31:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-05 17:17:01 +0100 |
| commit | 9c2ec72b95c13991f3c62b762783373c3d691337 (patch) | |
| tree | 31b9ff458251436c77e1cdd89be8aa579ef41d59 /tools/configure/configure.pro | |
| parent | 227accf0a3d1e177ece05d988196510f29240f58 (diff) | |
Improve path search in configure.
- Remove duplicated code locateFile/locateFileInPaths.
- Move basic path search functionality to Environment.
- Add functions for headerPaths/libraryPaths to Environment.
- Use QStandardPaths::findExecutable().
- Replace Environment::detectExecutable by
QStandardPaths::findExecutable().
- Introduce static path lists in findFile() to avoid
repeated directory scans
Change-Id: I9b93066a3de65f40527780d6ddf7989bca35cd04
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'tools/configure/configure.pro')
| -rw-r--r-- | tools/configure/configure.pro | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index c970880d8c..2163e37a58 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -63,6 +63,7 @@ HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/io/qiodevice.h \ $$QT_SOURCE_TREE/src/corelib/io/qtextstream.h \ $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.h \ + $$QT_SOURCE_TREE/src/corelib/io/qstandardpaths.h \ $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.h \ $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.h \ $$QT_SOURCE_TREE/src/corelib/tools/qmap.h \ @@ -110,6 +111,8 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ $$QT_SOURCE_TREE/src/corelib/io/qiodevice.cpp \ $$QT_SOURCE_TREE/src/corelib/io/qtextstream.cpp \ $$QT_SOURCE_TREE/src/corelib/io/qtemporaryfile.cpp \ + $$QT_SOURCE_TREE/src/corelib/io/qstandardpaths.cpp \ + $$QT_SOURCE_TREE/src/corelib/io/qstandardpaths_win.cpp \ $$QT_SOURCE_TREE/src/corelib/plugin/qsystemlibrary.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qbitarray.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qdatetime.cpp \ |