Fixed compile error (due to incorrectly resolved merge conflict).
authorSamuel Rødal <samuel.rodal@nokia.com>
Thu, 23 Jun 2011 15:15:33 +0000 (17:15 +0200)
committerSamuel Rødal <samuel.rodal@nokia.com>
Thu, 23 Jun 2011 15:15:33 +0000 (17:15 +0200)
commit2b7350c88d31b0875dee817444f8ff542a2465d9
tree7765e1ae91f245f94874f08d760f826e3a100a16
parent517d1156c302f51f2918898f33acb5101856e0fc
Fixed compile error (due to incorrectly resolved merge conflict).
src/declarative/qml/qdeclarativeengine.cpp