diff options
| author | Alessandro Portale <alessandro.portale@nokia.com> | 2011-02-01 13:22:39 +0100 |
|---|---|---|
| committer | con <qtc-committer@nokia.com> | 2011-02-02 09:22:42 +0100 |
| commit | 1da61869797f82f9cac6f452c2059a4ef8f5e6e5 (patch) | |
| tree | 2202a4f9781f4ad3fd7ff6a3073440a541e953ca | |
| parent | 6bf98fb7c305ab58204fe85c2a58b2c4a79066f6 (diff) | |
| download | qt-creator-1da61869797f82f9cac6f452c2059a4ef8f5e6e5.tar.gz | |
App wizard template: Move Network capability into main .pro
Removes the "DEFINES += NETWORKACCESS" from the main .pro file
replacing it by "symbian:TARGET.CAPABILITY += NetworkServices".
Task-Number: QTCREATORBUG-3594
reviewed-by: con
| -rw-r--r-- | share/qtcreator/templates/mobileapp/app.pro | 8 | ||||
| -rw-r--r-- | share/qtcreator/templates/qmlapp/app.pro | 8 | ||||
| -rw-r--r-- | share/qtcreator/templates/shared/deployment.pri | 1 |
3 files changed, 8 insertions, 9 deletions
diff --git a/share/qtcreator/templates/mobileapp/app.pro b/share/qtcreator/templates/mobileapp/app.pro index d5b07cba27..ec826e61e6 100644 --- a/share/qtcreator/templates/mobileapp/app.pro +++ b/share/qtcreator/templates/mobileapp/app.pro @@ -8,13 +8,13 @@ DEPLOYMENTFOLDERS = # file1 dir1 # ORIENTATIONLOCK # DEFINES += ORIENTATIONLOCK -# Needs to be defined for Symbian -# NETWORKACCESS # -DEFINES += NETWORKACCESS - # TARGETUID3 # symbian:TARGET.UID3 = 0xE1111234 +# Allow network access on Symbian +# NETWORKACCESS # +symbian:TARGET.CAPABILITY += NetworkServices + # If your application uses the Qt Mobility libraries, uncomment # the following lines and add the respective components to the # MOBILITY variable. diff --git a/share/qtcreator/templates/qmlapp/app.pro b/share/qtcreator/templates/qmlapp/app.pro index 5dcaeb3f68..cc8c334645 100644 --- a/share/qtcreator/templates/qmlapp/app.pro +++ b/share/qtcreator/templates/qmlapp/app.pro @@ -13,13 +13,13 @@ QML_IMPORT_PATH = # ORIENTATIONLOCK # DEFINES += ORIENTATIONLOCK -# Needs to be defined for Symbian -# NETWORKACCESS # -DEFINES += NETWORKACCESS - # TARGETUID3 # symbian:TARGET.UID3 = 0xE1111234 +# Allow network access on Symbian +# NETWORKACCESS # +symbian:TARGET.CAPABILITY += NetworkServices + # Define QMLJSDEBUGGER to allow debugging of QML in debug builds # (This might significantly increase build time) # DEFINES += QMLJSDEBUGGER diff --git a/share/qtcreator/templates/shared/deployment.pri b/share/qtcreator/templates/shared/deployment.pri index bf421fb5fa..c225424f19 100644 --- a/share/qtcreator/templates/shared/deployment.pri +++ b/share/qtcreator/templates/shared/deployment.pri @@ -22,7 +22,6 @@ symbian { isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 contains(DEFINES, ORIENTATIONLOCK):LIBS += -lavkon -leikcore -lcone - contains(DEFINES, NETWORKACCESS):TARGET.CAPABILITY += NetworkServices } else:win32 { copyCommand = for(deploymentfolder, DEPLOYMENTFOLDERS) { |