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/Makefile.win32 | |
| 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/Makefile.win32')
| -rw-r--r-- | tools/configure/Makefile.win32 | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/configure/Makefile.win32 b/tools/configure/Makefile.win32 index 5a917b1605..5b0a21a669 100644 --- a/tools/configure/Makefile.win32 +++ b/tools/configure/Makefile.win32 @@ -50,6 +50,8 @@ OBJECTS = \ qtextstream.obj \ qlogging.obj \ qtemporaryfile.obj \ + qstandardpaths.obj \ + qstandardpaths_win.obj \ qsystemlibrary.obj \ qbitarray.obj \ qdatetime.obj \ @@ -119,6 +121,8 @@ qfsfileengine_iterator.obj: $(CORESRC)\io\qfsfileengine_iterator.cpp $(PCH) qiodevice.obj: $(CORESRC)\io\qiodevice.cpp $(PCH) qtextstream.obj: $(CORESRC)\io\qtextstream.cpp $(PCH) qtemporaryfile.obj: $(CORESRC)\io\qtemporaryfile.cpp $(PCH) +qstandardpaths.obj: $(CORESRC)\io\qstandardpaths.cpp $(PCH) +qstandardpaths_win.obj: $(CORESRC)\io\qstandardpaths_win.cpp $(PCH) qsystemlibrary.obj: $(CORESRC)\plugin\qsystemlibrary.cpp $(PCH) qbitarray.obj: $(CORESRC)\tools\qbitarray.cpp $(PCH) qdatetime.obj: $(CORESRC)\tools\qdatetime.cpp $(PCH) |