feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/shared/qbs

Change-Id: Ic6f115e3d9da32327cfe2d02d7356687dc3f60d7
This commit is contained in:
Eike Ziller
2014-02-11 09:14:22 +01:00
parent 1f0665a3e2 cdc2a0f723
commit b03a981a41
52 changed files with 352 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
share/qtcreator/qml/qmlpuppet/qml2puppet/qml2puppet.pro
View File

@@ -1,6 +1,7 @@
TARGET = qml2puppet
TEMPLATE = app
CONFIG += console
DESTDIR = $$[QT_INSTALL_BINS]