diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 18:14:20 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-21 18:14:20 (GMT) |
| commit | fa93b7a048914205bcd17fd33a26344a54d4af9f (patch) | |
| tree | bfef4db5685dad71f598fa45514bba1dd79b6dc8 /qmake/qmake.pri | |
| parent | f05e08c1effde6641d9ac23df2a7d9219afdad96 (diff) | |
| download | Qt-fa93b7a048914205bcd17fd33a26344a54d4af9f.zip Qt-fa93b7a048914205bcd17fd33a26344a54d4af9f.tar.gz Qt-fa93b7a048914205bcd17fd33a26344a54d4af9f.tar.bz2 | |
Revert "Factored readRegistryKey implementation out of qmake"
This reverts commit f641369ceb7b7e2f95b9d0656b34c0517c5b95f7.
Conflicts:
qmake/Makefile.unix
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 187232f..17d9518 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -17,8 +17,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/symbian/symmake.cpp \ generators/symbian/symmake_abld.cpp \ generators/symbian/symmake_sbsv2.cpp \ - generators/symbian/initprojectdeploy_symbian.cpp \ - windows/registry.cpp + generators/symbian/initprojectdeploy_symbian.cpp HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ @@ -30,8 +29,8 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ - generators/symbian/initprojectdeploy_symbian.h \ - windows/registry.h + generators/symbian/epocroot.h \ + generators/symbian/initprojectdeploy_symbian.h contains(QT_EDITION, OpenSource) { DEFINES += QMAKE_OPENSOURCE_EDITION |