From bb594fc6897566cd2b636bb86c4c2da7faef7271 Mon Sep 17 00:00:00 2001
From: Espen Riskedal <espenr@trolltech.com>
Date: Fri, 21 Aug 2009 17:38:33 +0200
Subject: renamed examplebase.pri to symbianpkgrules.pri

examplesbase.pri sounded to generic and it was not obvious that this
was only for Symbian. Also merged the different symbian rules if they
were spread around in the .pro file.

Reviewed-by: Aleksandar Sasha Babic
---
 examples/xml/dombookmarks/dombookmarks.pro       | 2 +-
 examples/xml/htmlinfo/htmlinfo.pro               | 7 ++++---
 examples/xml/rsslisting/rsslisting.pro           | 2 +-
 examples/xml/saxbookmarks/saxbookmarks.pro       | 5 ++---
 examples/xml/streambookmarks/streambookmarks.pro | 2 +-
 examples/xml/xml.pro                             | 2 +-
 examples/xml/xmlstreamlint/xmlstreamlint.pro     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'examples/xml')

diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro
index f38321f45c..25e21cd24e 100644
--- a/examples/xml/dombookmarks/dombookmarks.pro
+++ b/examples/xml/dombookmarks/dombookmarks.pro
@@ -11,7 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro
index d8285184d4..f70fb7de64 100644
--- a/examples/xml/htmlinfo/htmlinfo.pro
+++ b/examples/xml/htmlinfo/htmlinfo.pro
@@ -13,6 +13,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
-
-symbian:TARGET.UID3 = 0xA000C609
+symbian {
+    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
+    TARGET.UID3 = 0xA000C609
+}
diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro
index c0a1ad33ed..e93cad0da9 100644
--- a/examples/xml/rsslisting/rsslisting.pro
+++ b/examples/xml/rsslisting/rsslisting.pro
@@ -8,5 +8,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
 
diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro
index 3556c117ef..16ef184f46 100644
--- a/examples/xml/saxbookmarks/saxbookmarks.pro
+++ b/examples/xml/saxbookmarks/saxbookmarks.pro
@@ -13,8 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS saxbookmarks.pro *.xbel
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
-
 wince*: {
      addFiles.sources = frank.xbel jennifer.xbel
      addFiles.path = \My Documents
@@ -22,8 +20,9 @@ wince*: {
 }
 
 symbian: {
+     include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
      TARGET.UID3 = 0xA000C60A
      addFiles.sources = frank.xbel jennifer.xbel
      addFiles.path = /data/qt/saxbookmarks
      DEPLOYMENT += addFiles
-}
\ No newline at end of file
+}
diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro
index f16a02ebaf..2b1841f70e 100644
--- a/examples/xml/streambookmarks/streambookmarks.pro
+++ b/examples/xml/streambookmarks/streambookmarks.pro
@@ -13,4 +13,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xb
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro
index 2b6415c0cf..0bc6dd9fb3 100644
--- a/examples/xml/xml.pro
+++ b/examples/xml/xml.pro
@@ -14,4 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro
index 4f97387dfc..6a09f1ad5c 100644
--- a/examples/xml/xmlstreamlint/xmlstreamlint.pro
+++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro
@@ -9,4 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint
 INSTALLS += target sources
 
-include($$QT_SOURCE_TREE/examples/examplebase.pri)
+symbian: include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-- 
cgit v1.2.3