equal
deleted
inserted
replaced
55 symbian-abld|symbian-sbsv2 { |
55 symbian-abld|symbian-sbsv2 { |
56 pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) |
56 pluginLocations = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) |
57 bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) |
57 bearerPluginLocation = $${EPOCROOT}epoc32/release/$(PLATFORM)/$(TARGET) |
58 bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin |
58 bearerStubZ = $${EPOCROOT}$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin |
59 BLD_INF_RULES.prj_exports += \ |
59 BLD_INF_RULES.prj_exports += \ |
60 "qsymbianbearer.qtplugin $$bearerStubZ" \ |
60 "qsymbianbearer.qtplugin /$${HW_ZDIR}$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" \ |
61 "qsymbianbearer.qtplugin $${EPOCROOT}epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" |
61 "qsymbianbearer.qtplugin /epoc32/winscw/c$${QT_PLUGINS_BASE_DIR}/bearer/qsymbianbearer$${QT_LIBINFIX}.qtplugin" |
62 } else { |
62 } else { |
63 pluginLocations = $$QT_BUILD_TREE/plugins/s60 |
63 pluginLocations = $$QT_BUILD_TREE/plugins/s60 |
64 bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer |
64 bearerPluginLocation = $$QT_BUILD_TREE/plugins/bearer |
65 bearerStubZ = $${PWD}/qsymbianbearer.qtplugin |
65 bearerStubZ = $${PWD}/qsymbianbearer.qtplugin |
66 } |
66 } |
187 "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ |
187 "[0x102032BE],0,0,0,{\"S60ProductID\"}" \ |
188 "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ |
188 "[0x102752AE],0,0,0,{\"S60ProductID\"}" \ |
189 "[0x1028315F],0,0,0,{\"S60ProductID\"}" |
189 "[0x1028315F],0,0,0,{\"S60ProductID\"}" |
190 } |
190 } |
191 |
191 |
|
192 contains(QT_CONFIG, opengl) { |
|
193 qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtOpenGL$${QT_LIBINFIX}.dll |
|
194 graphicssystems_plugins.sources += $$QT_BUILD_TREE/plugins/graphicssystems/qglgraphicssystem$${QT_LIBINFIX}.dll |
|
195 } |
|
196 |
192 contains(QT_CONFIG, multimedia){ |
197 contains(QT_CONFIG, multimedia){ |
193 qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll |
198 qtlibraries.sources += $$QMAKE_LIBDIR_QT/QtMultimedia$${QT_LIBINFIX}.dll |
194 } |
199 } |
195 |
200 |
196 BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" |
201 BLD_INF_RULES.prj_exports += "qt.iby $$CORE_MW_LAYER_IBY_EXPORT_PATH(qt.iby)" |