diff -r e5618cc85d74 -r 6c158198356e javamanager/javainstaller/installer/build/javainstaller.pro --- a/javamanager/javainstaller/installer/build/javainstaller.pro Thu Jul 15 18:31:06 2010 +0300 +++ b/javamanager/javainstaller/installer/build/javainstaller.pro Thu Aug 19 09:48:13 2010 +0300 @@ -37,7 +37,8 @@ INCLUDEPATH += ../src.s60/applicationregistrator \ ../src.s60/iconconverter \ ../src.s60/jadjarmatcher \ - ../src.s60/utils + ../src.s60/utils \ + ../../iconsizenotifplugin/inc SOURCES += ../src.s60/applicationregistrator/applicationregistrator.cpp \ ../src.s60/applicationregistrator/sifnotifier.cpp \ @@ -48,29 +49,31 @@ ../src.s60/jadjarmatcher/jadjarmatcherscanfrominbox.cpp \ ../src.s60/utils/filewriter.cpp \ ../src.s60/utils/fileroots.cpp \ + ../src.s60/utils/propertylistener.cpp \ + ../src.s60/utils/propertyprovider.cpp \ ../src.s60/utils/sysutil.cpp LIBS += -lapgrfx -lbafl -lcentralrepository -lcharconv -lefsrv -lestor \ -lezip -lfbscli -limageconversion -lmsgs \ -lsysutil -lplatformenv -lws32 -lapparc -lcentralrepository \ - -lhal -lcaf -lcafutils + -lhal -lcaf -lcafutils -lbitmaptransforms contains(PROJECT_DEFINES,RD_JAVA_S60_50_REL2) { LIBS += -lmcsmenu } contains(PROJECT_DEFINES,RD_JAVA_S60_RELEASE_10_1_ONWARDS) { - LIBS += -lQtServiceFramework - } - - contains(PROJECT_DEFINES,RD_JAVA_USIF_NOTIFY_PROGRESS) { - LIBS += -lsifnotification + CONFIG += hb + LIBS += -lsifnotification -lxqservice } MMP_RULES += \ "$${LITERAL_HASH}include " \ "$${LITERAL_HASH}ifdef SYMBIAN_UNIVERSAL_INSTALL_FRAMEWORK" \ "LIBRARY scrclient.lib" \ + "$${LITERAL_HASH}else" \ + "LIBRARY ecom.lib" \ + "LIBRARY SWInstTaskManager.lib" \ "$${LITERAL_HASH}endif" } else { CONFIG += omj java javaonly stl