forked from qt-creator/qt-creator
		
	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
This commit is contained in:
		@@ -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. 
 | 
			
		||||
 
 | 
			
		||||
@@ -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
 | 
			
		||||
 
 | 
			
		||||
@@ -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) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user