diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2012-01-25 14:43:07 +1000 |
| commit | c3601a8db91bc777ea859d6a796dfab6a218675e (patch) | |
| tree | d2a4f6c83bec3cddcce020966cccac72be3aa04a /src/qtquick1/qtquick1.pro | |
| parent | 35794301d188b731a7b596d92fc632fff58586c0 (diff) | |
| parent | 149f6afe321ce59aebe4ce2f9dddd1881d0ac22b (diff) | |
Merge branch 'master' into animation-refactorwip/animation-refactor
Conflicts:
tests/auto/declarative/declarative.pro
Change-Id: Ie339be2989fac553d351f3077869f1847367b504
Diffstat (limited to 'src/qtquick1/qtquick1.pro')
| -rw-r--r-- | src/qtquick1/qtquick1.pro | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/qtquick1/qtquick1.pro b/src/qtquick1/qtquick1.pro index c59f1af07d..529e3a0ae3 100644 --- a/src/qtquick1/qtquick1.pro +++ b/src/qtquick1/qtquick1.pro @@ -20,16 +20,6 @@ INSTALLS += feature win32-msvc*:DEFINES *= _CRT_SECURE_NO_WARNINGS -symbian { - DEFINES += QT_MAKEDLL - CONFIG += epocallowdlldata - contains(QT_EDITION, OpenSource) { - TARGET.CAPABILITY = LocalServices NetworkServices ReadUserData UserEnvironment WriteUserData - } else { - TARGET.CAPABILITY = All -Tcb - } -} - #INCLUDEPATH += $$PWD/QtQuick1 #INCLUDEPATH += $$PWD |