diff options
author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:54:57 (GMT) |
---|---|---|
committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-02-20 07:54:57 (GMT) |
commit | ce27cf24539e0c7971937e55d8539496ad51ee52 (patch) | |
tree | 86ddea82eca7e682409cbc2c568594a0116062c6 /qmake/qmake.pri | |
parent | 6f44020cf97bd74e02ee011e6cb182aa93109b21 (diff) | |
parent | 1f10c6be975a2d36c05d926b332b869ad6339877 (diff) | |
download | Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.zip Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.gz Qt-ce27cf24539e0c7971937e55d8539496ad51ee52.tar.bz2 |
Merge remote branch 'origin/4.6' into qt-master-from-4.6
Conflicts:
qmake/Makefile.unix
qmake/generators/symbian/symmake.cpp
Diffstat (limited to 'qmake/qmake.pri')
-rw-r--r-- | qmake/qmake.pri | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/qmake/qmake.pri b/qmake/qmake.pri index 17d9518..0821f00 100644 --- a/qmake/qmake.pri +++ b/qmake/qmake.pri @@ -17,7 +17,9 @@ 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 + generators/symbian/initprojectdeploy_symbian.cpp \ + windows/registry.cpp \ + symbian/epocroot.cpp HEADERS += project.h property.h generators/makefile.h \ generators/unix/unixmake.h meta.h option.h cachekeys.h \ @@ -29,8 +31,9 @@ HEADERS += project.h property.h generators/makefile.h \ generators/symbian/symmake.h \ generators/symbian/symmake_abld.h \ generators/symbian/symmake_sbsv2.h \ - generators/symbian/epocroot.h \ - generators/symbian/initprojectdeploy_symbian.h + generators/symbian/initprojectdeploy_symbian.h \ + windows/registry.h \ + symbian/epocroot.h contains(QT_EDITION, OpenSource) { DEFINES += QMAKE_OPENSOURCE_EDITION |