diff options
| author | axis <qt-info@nokia.com> | 2010-02-19 08:50:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2010-02-19 08:50:34 (GMT) |
| commit | 603dc7d659084c5d092de79fec08a0baca8eaa59 (patch) | |
| tree | 383eb16d49c8b59b9bab920932b906eb1f0d192e /qmake/qmake.pri | |
| parent | ed604d1a6420c1e6598b7d509dd108aa20db4509 (diff) | |
| download | Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.zip Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.gz Qt-603dc7d659084c5d092de79fec08a0baca8eaa59.tar.bz2 | |
Revert "Factored epocRoot implementation out of qmake"
This reverts commit 13cb80be958c40077245cbc4b36448a661e30c64.
It breaks non-Symbian platforms.
Diffstat (limited to 'qmake/qmake.pri')
| -rw-r--r-- | qmake/qmake.pri | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 05debe6..a2ffe15 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -18,8 +18,7 @@ SOURCES += project.cpp property.cpp main.cpp generators/makefile.cpp \ generators/symbian/symmake_abld.cpp \ generators/symbian/symmake_sbsv2.cpp \ generators/symbian/initprojectdeploy_symbian.cpp \ - windows/registry.cpp \ - symbian/epocroot.cpp + windows/registry.cpp HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ @@ -32,8 +31,7 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ generators/symbian/initprojectdeploy_symbian.h \ - windows/registry.h \ - symbian/epocroot.h + windows/registry.h contains(QT_EDITION, OpenSource) { DEFINES += QMAKE_OPENSOURCE_EDITION |