diff options
| author | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-10 15:16:20 (GMT) |
|---|---|---|
| committer | Gareth Stockwell <ext-gareth.stockwell@nokia.com> | 2010-02-18 16:34:18 (GMT) |
| commit | ea34fbde76a0407dc4a9bb9f4a3140c4764ca6ba (patch) | |
| tree | 82d438d523141fc88471c6bcaabefcbb7e4dbc1c /tools/configure/configure.pro | |
| parent | 13cb80be958c40077245cbc4b36448a661e30c64 (diff) | |
| download | Qt-ea34fbde76a0407dc4a9bb9f4a3140c4764ca6ba.zip Qt-ea34fbde76a0407dc4a9bb9f4a3140c4764ca6ba.tar.gz Qt-ea34fbde76a0407dc4a9bb9f4a3140c4764ca6ba.tar.bz2 | |
Removed duplicated implementation of readRegistryKeys from configure
Configure now shares - at the source level - a single implementation
of this function with qmake.
Reviewed-by: Miikka Heikkinen
Diffstat (limited to 'tools/configure/configure.pro')
| -rw-r--r-- | tools/configure/configure.pro | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/tools/configure/configure.pro b/tools/configure/configure.pro index 243183c..ca2ba84 100644 --- a/tools/configure/configure.pro +++ b/tools/configure/configure.pro @@ -27,6 +27,7 @@ INCPATH += $$QT_SOURCE_TREE/src/corelib/arch/generic \ $$QT_SOURCE_TREE/src/corelib/global \ $$QT_BUILD_TREE/include \ $$QT_BUILD_TREE/include/QtCore \ + $$QT_BUILD_TREE/tools/shared HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qbytearray.h \ @@ -58,7 +59,8 @@ HEADERS = configureapp.h environment.h tools.h\ $$QT_SOURCE_TREE/src/corelib/tools/qstring.h \ $$QT_SOURCE_TREE/src/corelib/tools/qstringlist.h \ $$QT_SOURCE_TREE/src/corelib/tools/qstringmatcher.h \ - $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h + $$QT_SOURCE_TREE/src/corelib/tools/qunicodetables_p.h \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.h SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ @@ -102,7 +104,8 @@ SOURCES = main.cpp configureapp.cpp environment.cpp tools.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qpoint.cpp \ $$QT_SOURCE_TREE/src/corelib/tools/qrect.cpp \ $$QT_SOURCE_TREE/src/corelib/kernel/qmetatype.cpp \ - $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp + $$QT_SOURCE_TREE/src/corelib/global/qmalloc.cpp \ + $$QT_SOURCE_TREE/tools/shared/windows/registry.cpp win32:SOURCES += $$QT_SOURCE_TREE/src/corelib/io/qfsfileengine_win.cpp |