Eike Ziller 38b61177f6 Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.cpp
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/objectnodeinstance.h
	tests/auto/treeviewfind/treeviewfind.pro

Change-Id: I1ec788373656c947b50d72df6c26c91312469692

2013-04-23 11:13:25 +02:00

..

instances

Merge remote-tracking branch 'origin/2.7'

2013-04-23 11:13:25 +02:00

Info.plist.in

Replace com.nokia.qtcreator with org.qt-project.qtcreator

2013-02-07 12:40:37 +01:00

main.cpp

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qmlpuppet.pri

Generalize QT_NO_CAST_FROM_ASCII

2013-01-16 01:14:08 +01:00

qmlpuppet.pro

QmlDesigner: compile fix for share qmlpuppet and Qt 5.1

2013-03-06 18:12:46 +01:00