Commit e5bef06d authored by Tobias Hunger's avatar Tobias Hunger

Wizards: Use configured extensions for c++ sources and headers

Task-number: QTCREATORBUG-12309
Change-Id: I3d6ebe84408427b5a4e499a6d38ef5f37711610e
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent e7ac3bf1
...@@ -4,11 +4,11 @@ LIBS += -lbbdata -lbb -lbbcascades ...@@ -4,11 +4,11 @@ LIBS += -lbbdata -lbb -lbbcascades
QT += declarative xml QT += declarative xml
SOURCES += \ SOURCES += \
src/main.cpp \ src/main.%CppSourceSuffix% \
src/applicationui.cpp \ src/applicationui.%CppSourceSuffix% \
HEADERS += \ HEADERS += \
src/applicationui.h \ src/applicationui.%CppHeaderSuffix% \
OTHER_FILES += \ OTHER_FILES += \
bar-descriptor.xml \ bar-descriptor.xml \
......
...@@ -41,9 +41,9 @@ ...@@ -41,9 +41,9 @@
<file source="assets/main.qml" openeditor="true"/> <file source="assets/main.qml" openeditor="true"/>
<file source="bar-descriptor.xml" openeditor="true"/> <file source="bar-descriptor.xml" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
<file source="src/main.cpp" openeditor="true"/> <file source="src/main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="src/applicationui.h" openproject="true"/> <file source="src/applicationui.h" target="applicationui.%CppHeaderSuffix%" openproject="true"/>
<file source="src/applicationui.cpp" openproject="true"/> <file source="src/applicationui.cpp" target="applicationui.%CppSourceSuffix%" openproject="true"/>
<file source="icon.png"/> <file source="icon.png"/>
</files> </files>
</wizard> </wizard>
...@@ -12,4 +12,4 @@ CONFIG += console ...@@ -12,4 +12,4 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
@endif @endif
SOURCES += main.cpp SOURCES += main.%CppSourceSuffix%
...@@ -41,7 +41,7 @@ leave room for the Qt 4 target page. ...@@ -41,7 +41,7 @@ leave room for the Qt 4 target page.
<displayname>Code Snippet</displayname>; <displayname>Code Snippet</displayname>;
<displaycategory>Other Projects</displaycategory> <displaycategory>Other Projects</displaycategory>
<files> <files>
<file source="main.cpp" openeditor="true"/> <file source="main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
</files> </files>
<fieldpagetitle>Snippet Parameters</fieldpagetitle> <fieldpagetitle>Snippet Parameters</fieldpagetitle>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<displayname>Plain C++ Project (CMake Build)</displayname>; <displayname>Plain C++ Project (CMake Build)</displayname>;
<displaycategory>Non-Qt Project</displaycategory> <displaycategory>Non-Qt Project</displaycategory>
<files> <files>
<file source="../common/main.cpp" target="main.cpp" openeditor="true"/> <file source="../common/main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="CMakeLists.txt" openproject="true"/> <file source="CMakeLists.txt" openproject="true"/>
</files> </files>
</wizard> </wizard>
...@@ -3,7 +3,7 @@ import qbs ...@@ -3,7 +3,7 @@ import qbs
CppApplication { CppApplication {
type: "application" // To suppress bundle generation on Mac type: "application" // To suppress bundle generation on Mac
consoleApplication: true consoleApplication: true
files: "main.cpp" files: "main.%CppSourceSuffix%"
Group { // Properties for the produced executable Group { // Properties for the produced executable
fileTagsFilter: product.type fileTagsFilter: product.type
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
<displayname>Plain C++ Project (Qbs Build)</displayname>; <displayname>Plain C++ Project (Qbs Build)</displayname>;
<displaycategory>Non-Qt Project</displaycategory> <displaycategory>Non-Qt Project</displaycategory>
<files> <files>
<file source="../common/main.cpp" target="main.cpp" openeditor="true"/> <file source="../common/main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="project.qbs" target="%ProjectName%.qbs" openproject="true"/> <file source="project.qbs" target="%ProjectName%.qbs" openproject="true"/>
</files> </files>
</wizard> </wizard>
...@@ -3,7 +3,7 @@ CONFIG += console ...@@ -3,7 +3,7 @@ CONFIG += console
CONFIG -= app_bundle CONFIG -= app_bundle
CONFIG -= qt CONFIG -= qt
SOURCES += main.cpp SOURCES += main.%CppSourceSuffix%
include(deployment.pri) include(deployment.pri)
qtcAddDeployment() qtcAddDeployment()
...@@ -43,7 +43,7 @@ leave room for the Qt 4 target page. ...@@ -43,7 +43,7 @@ leave room for the Qt 4 target page.
<displayname>Plain C++ Project</displayname>; <displayname>Plain C++ Project</displayname>;
<displaycategory>Non-Qt Project</displaycategory> <displaycategory>Non-Qt Project</displaycategory>
<files> <files>
<file source="../common/main.cpp" target="main.cpp" openeditor="true"/> <file source="../common/main.cpp" target="main.%CppSourceSuffix%" openeditor="true"/>
<file source="../../../shared/deployment.pri" target="deployment.pri"/> <file source="../../../shared/deployment.pri" target="deployment.pri"/>
<file source="project.pro" target="%ProjectName%.pro" openproject="true"/> <file source="project.pro" target="%ProjectName%.pro" openproject="true"/>
</files> </files>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment