summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@digia.com>2012-12-04 17:41:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-12-05 15:26:19 +0100
commit0e0dfb027774e0afc38df19a4a5e80dd97ab0356 (patch)
treed9f750910b19372c6206c5783c80777a2fe43697
parentefa8c5daedc789eee950218e98caa15f6b992bb5 (diff)
fix installation target paths of examples
Change-Id: I11440d60a709cbe4617aa0953c7971a6d731b73b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
-rw-r--r--examples/designer/calculatorbuilder/calculatorbuilder.pro3
-rw-r--r--examples/designer/calculatorform/calculatorform.pro3
-rw-r--r--examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro3
-rw-r--r--examples/examples.pro2
-rw-r--r--examples/help/contextsensitivehelp/contextsensitivehelp.pro3
-rw-r--r--examples/help/remotecontrol/remotecontrol.pro3
-rw-r--r--examples/help/simpletextviewer/simpletextviewer.pro3
-rw-r--r--examples/linguist/arrowpad/arrowpad.pro3
-rw-r--r--examples/linguist/hellotr/hellotr.pro3
-rw-r--r--examples/linguist/trollprint/trollprint.pro3
-rw-r--r--examples/uitools/multipleinheritance/multipleinheritance.pro3
-rw-r--r--examples/uitools/textfinder/textfinder.pro3
12 files changed, 12 insertions, 23 deletions
diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro
index 4294a8a04..052dbd38a 100644
--- a/examples/designer/calculatorbuilder/calculatorbuilder.pro
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro
@@ -6,6 +6,5 @@ SOURCES = calculatorform.cpp \
QT += widgets uitools
#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorbuilder
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorbuilder
INSTALLS += target
diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro
index 9d3c635cb..0ee1b1f61 100644
--- a/examples/designer/calculatorform/calculatorform.pro
+++ b/examples/designer/calculatorform/calculatorform.pro
@@ -7,6 +7,5 @@ SOURCES = calculatorform.cpp \
main.cpp
QT += widgets
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/calculatorform
INSTALLS += target
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
index eb1e3b75e..1e420aa65 100644
--- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
@@ -4,6 +4,5 @@ SOURCES = main.cpp
RESOURCES = worldtimeclockbuilder.qrc
#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockbuilder
+target.path = $$[QT_INSTALL_EXAMPLES]/designer/worldtimeclockbuilder
INSTALLS += target
diff --git a/examples/examples.pro b/examples/examples.pro
index c81388c25..3f5f71a04 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -1,3 +1,3 @@
TEMPLATE = subdirs
-!isEmpty(QT.widgets.name): SUBDIRS += help designer uitools
+!isEmpty(QT.widgets.name): SUBDIRS += help designer linguist uitools
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
index 4f3da5255..516a2e45c 100644
--- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -10,6 +10,5 @@ HEADERS += wateringconfigdialog.h \
FORMS += wateringconfigdialog.ui
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp
+target.path = $$[QT_INSTALL_EXAMPLES]/help/contextsensitivehelp
INSTALLS += target
diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro
index 593c87064..78ce822d8 100644
--- a/examples/help/remotecontrol/remotecontrol.pro
+++ b/examples/help/remotecontrol/remotecontrol.pro
@@ -7,7 +7,6 @@ SOURCES += main.cpp \
FORMS += remotecontrol.ui
RESOURCES += remotecontrol.qrc
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/remotecontrol
+target.path = $$[QT_INSTALL_EXAMPLES]/help/remotecontrol
INSTALLS += target
diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro
index 232b85995..2b0a1ace6 100644
--- a/examples/help/simpletextviewer/simpletextviewer.pro
+++ b/examples/help/simpletextviewer/simpletextviewer.pro
@@ -10,6 +10,5 @@ SOURCES = main.cpp \
QT += widgets
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer
+target.path = $$[QT_INSTALL_EXAMPLES]/help/simpletextviewer
INSTALLS += target
diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro
index b78f1d475..972370392 100644
--- a/examples/linguist/arrowpad/arrowpad.pro
+++ b/examples/linguist/arrowpad/arrowpad.pro
@@ -9,8 +9,7 @@ TRANSLATIONS = arrowpad_fr.ts \
arrowpad_nl.ts
#! [1]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/arrowpad
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad
INSTALLS += target
QT += widgets
diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro
index b789e2f41..766b53696 100644
--- a/examples/linguist/hellotr/hellotr.pro
+++ b/examples/linguist/hellotr/hellotr.pro
@@ -4,8 +4,7 @@ SOURCES = main.cpp
TRANSLATIONS = hellotr_la.ts
#! [1]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/hellotr
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr
INSTALLS += target
QT += widgets
diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro
index a02cd1557..fa5175198 100644
--- a/examples/linguist/trollprint/trollprint.pro
+++ b/examples/linguist/trollprint/trollprint.pro
@@ -5,8 +5,7 @@ SOURCES = main.cpp \
printpanel.cpp
TRANSLATIONS = trollprint_pt.ts
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/linguist/trollprint
+target.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint
INSTALLS += target
QT += widgets
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index cabdefdd4..06f29b3e7 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -4,8 +4,7 @@ HEADERS = calculatorform.h
FORMS = calculatorform.ui
#! [0]
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/multipleinheritance
+target.path = $$[QT_INSTALL_EXAMPLES]/uitools/multipleinheritance
INSTALLS += target
QT += widgets
diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro
index 54309621d..0e6421f6c 100644
--- a/examples/uitools/textfinder/textfinder.pro
+++ b/examples/uitools/textfinder/textfinder.pro
@@ -2,8 +2,7 @@ HEADERS = textfinder.h
RESOURCES = textfinder.qrc
SOURCES = textfinder.cpp main.cpp
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder
+target.path = $$[QT_INSTALL_EXAMPLES]/uitools/textfinder
INSTALLS += target
QT += widgets uitools