diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2010-09-21 08:30:48 (GMT) |
|---|---|---|
| committer | Qt Commercial Integration <QtCommercial@digia.com> | 2012-01-31 10:24:55 (GMT) |
| commit | 93db38955314bf1f65ec5e66b23d005117358135 (patch) | |
| tree | c064086b0f840bf63daab268be7599632277eb10 | |
| parent | e205b8d34dce04d242942e1dec91ca667128cf5c (diff) | |
| download | Qt-93db38955314bf1f65ec5e66b23d005117358135.zip Qt-93db38955314bf1f65ec5e66b23d005117358135.tar.gz Qt-93db38955314bf1f65ec5e66b23d005117358135.tar.bz2 | |
fix project name duplicates in generated projects.sln
Using QMAKE_PROJECT_NAME to rename certain projects.
Task-number: QTBUG-6887
Reviewed-by: owolff
| -rw-r--r-- | examples/draganddrop/puzzle/puzzle.pro | 2 | ||||
| -rw-r--r-- | examples/graphicsview/flowlayout/flowlayout.pro | 6 | ||||
| -rw-r--r-- | examples/script/calculator/calculator.pro | 1 | ||||
| -rw-r--r-- | examples/tools/echoplugin/echowindow/echowindow.pro | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/examples/draganddrop/puzzle/puzzle.pro b/examples/draganddrop/puzzle/puzzle.pro index 31786c7..ec88f7a 100644 --- a/examples/draganddrop/puzzle/puzzle.pro +++ b/examples/draganddrop/puzzle/puzzle.pro @@ -7,6 +7,8 @@ SOURCES = main.cpp \ pieceslist.cpp \ puzzlewidget.cpp +QMAKE_PROJECT_NAME = dndpuzzle + # install target.path = $$[QT_INSTALL_EXAMPLES]/draganddrop/puzzle sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro index c029d6c..ce35367 100644 --- a/examples/graphicsview/flowlayout/flowlayout.pro +++ b/examples/graphicsview/flowlayout/flowlayout.pro @@ -1,12 +1,10 @@ -###################################################################### -# Automatically generated by qmake (2.01a) ma 30. mar 12:46:15 2009 -###################################################################### - TEMPLATE = app TARGET = DEPENDPATH += . INCLUDEPATH += . +QMAKE_PROJECT_NAME = flowlayout_graphicsview + # Input HEADERS += flowlayout.h window.h SOURCES += flowlayout.cpp main.cpp window.cpp diff --git a/examples/script/calculator/calculator.pro b/examples/script/calculator/calculator.pro index 6385d7e..f328fc3 100644 --- a/examples/script/calculator/calculator.pro +++ b/examples/script/calculator/calculator.pro @@ -2,6 +2,7 @@ QT += script CONFIG += uitools RESOURCES += calculator.qrc SOURCES += main.cpp +QMAKE_PROJECT_NAME = scripted_calculator contains(QT_CONFIG, scripttools): QT += scripttools diff --git a/examples/tools/echoplugin/echowindow/echowindow.pro b/examples/tools/echoplugin/echowindow/echowindow.pro index d56961c..67c5237 100644 --- a/examples/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/tools/echoplugin/echowindow/echowindow.pro @@ -4,6 +4,7 @@ SOURCES = echowindow.cpp \ main.cpp TARGET = echoplugin +QMAKE_PROJECT_NAME = echopluginwindow win32 { CONFIG(debug, release|debug):DESTDIR = ../debug/ CONFIG(release, release|debug):DESTDIR = ../release/ |