From 997f7b660705a717b99f3e97b6bb76d28be76c6c Mon Sep 17 00:00:00 2001 From: Doug Schaefer Date: Mon, 14 Jan 2013 17:02:36 -0500 Subject: [PATCH] Fix qt template to use variable instead of test data. --- .../templates/project/helloWorld/qtQuick2/Basename.qml | 2 +- .../templates/project/helloWorld/qtQuick2/Makefile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Basename.qml b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Basename.qml index 897812a6cb4..2ff2ef6170c 100644 --- a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Basename.qml +++ b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Basename.qml @@ -4,7 +4,7 @@ Rectangle { width: 360 height: 360 Text { - text: qsTr("Hello World") + text: qsTr("Hello World from $(baseName)") anchors.centerIn: parent } MouseArea { diff --git a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile index 86932e1beb6..5a41246df1d 100644 --- a/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile +++ b/qt/org.eclipse.cdt.qt.core/templates/project/helloWorld/qtQuick2/Makefile @@ -6,7 +6,7 @@ clean: clean-debug clean-release build-debug/Makefile: @mkdir -p $(dir $@) - $(QMAKE) -o $@ clangtest.pro CONFIG+=debug + $(QMAKE) -o $@ {{baseName}}.pro CONFIG+=debug debug: build-debug/Makefile $(MAKE) -w -C build-debug @@ -16,7 +16,7 @@ clean-debug: build-release/Makefile: @mkdir -p $(dir $@) - $(QMAKE) -o $@ clangtest.pro CONFIG+=release + $(QMAKE) -o $@ {{baseName}}.pro CONFIG+=release release: build-release/Makefile $(MAKE) -w -C build-release