diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 12:54:37 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2013-04-18 12:54:37 +0200 |
| commit | 55de6a9fb92ea28a569107f4abc81eeb39bbabd7 (patch) | |
| tree | 855cede9894b8e92eb73adb473ebdc3afc5c04e4 /share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri | |
| parent | 17a26e008ab2702a86055036904e058eff07ff19 (diff) | |
| parent | 4647cb77d30e0a991faea197e8eba4fcec0d27a9 (diff) | |
Merge remote-tracking branch 'origin/2.7' into HEAD
Conflicts:
src/plugins/coreplugin/generalsettings.cpp
Change-Id: Ic92d637fb92748b2bb40e1a2895ea5d0644b4646
Diffstat (limited to 'share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri')
| -rw-r--r-- | share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri index 77af6b59ee..b86d8deed3 100644 --- a/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri +++ b/share/qtcreator/qml/qmlpuppet/qml2puppet/instances/instances.pri @@ -20,6 +20,7 @@ HEADERS += $$PWD/qmltransitionnodeinstance.h HEADERS += $$PWD/servernodeinstance.h HEADERS += $$PWD/anchorchangesnodeinstance.h HEADERS += $$PWD/positionernodeinstance.h +HEADERS += $$PWD/quickwindownodeinstance.h SOURCES += $$PWD/qt5nodeinstanceserver.cpp SOURCES += $$PWD/qt5informationnodeinstanceserver.cpp @@ -41,3 +42,4 @@ SOURCES += $$PWD/qmltransitionnodeinstance.cpp SOURCES += $$PWD/servernodeinstance.cpp SOURCES += $$PWD/anchorchangesnodeinstance.cpp SOURCES += $$PWD/positionernodeinstance.cpp +SOURCES += $$PWD/quickwindownodeinstance.cpp |