summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sergio.ahumada@digia.com>2012-11-27 20:21:06 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-27 20:37:19 +0100
commitd1422fd6db69778cb357a3afb41a5a9e1aaa42f0 (patch)
tree53b56aa66c30c1d285703311318b05cec52f4dd1
parent408eb1d5c2d6f1d2e15bb178136bb346edc0f491 (diff)
downloadqtwebkit-examples-d1422fd6db69778cb357a3afb41a5a9e1aaa42f0.tar.gz
Update information from Nokia to Digia and Qt Project
Task-number: QTBUG-28156 Change-Id: I16ac473c25c9ab5baec93cfc8523b26da5be80f2 Reviewed-by: Andras Becsi <andras.becsi@digia.com>
-rw-r--r--examples/browser/Info_mac.plist2
-rw-r--r--examples/browser/browsermainwindow.cpp2
-rw-r--r--examples/browser/data/browser.svg2
-rw-r--r--examples/embedded/anomaly/src/BookmarksView.cpp4
-rw-r--r--examples/webkit/domtraversal/main.cpp2
-rw-r--r--examples/webkit/domtraversal/window.ui2
-rw-r--r--examples/webkit/framecapture/main.cpp2
-rw-r--r--examples/webkit/imageanalyzer/imageanalyzer.cpp2
8 files changed, 9 insertions, 9 deletions
diff --git a/examples/browser/Info_mac.plist b/examples/browser/Info_mac.plist
index 5648631..a4731c2 100644
--- a/examples/browser/Info_mac.plist
+++ b/examples/browser/Info_mac.plist
@@ -38,6 +38,6 @@
</dict>
</array>
<key>NOTE</key>
- <string>DemoBrowser by Nokia Corporation and/or its subsidiary(-ies)</string>
+ <string>DemoBrowser by Digia Plc and/or its subsidiary(-ies)</string>
</dict>
</plist>
diff --git a/examples/browser/browsermainwindow.cpp b/examples/browser/browsermainwindow.cpp
index dde3987..9561a3d 100644
--- a/examples/browser/browsermainwindow.cpp
+++ b/examples/browser/browsermainwindow.cpp
@@ -796,7 +796,7 @@ void BrowserMainWindow::slotHome()
{
QSettings settings;
settings.beginGroup(QLatin1String("MainWindow"));
- QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt.nokia.com/")).toString();
+ QString home = settings.value(QLatin1String("home"), QLatin1String("http://qt-project.org/")).toString();
loadPage(home);
}
diff --git a/examples/browser/data/browser.svg b/examples/browser/data/browser.svg
index 4c31403..9908aed 100644
--- a/examples/browser/data/browser.svg
+++ b/examples/browser/data/browser.svg
@@ -276,7 +276,7 @@
</dc:creator>
<dc:rights>
<cc:Agent>
- <dc:title>Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies).</dc:title>
+ <dc:title>Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).</dc:title>
</cc:Agent>
</dc:rights>
</cc:Work>
diff --git a/examples/embedded/anomaly/src/BookmarksView.cpp b/examples/embedded/anomaly/src/BookmarksView.cpp
index 7ed7289..63e48e2 100644
--- a/examples/embedded/anomaly/src/BookmarksView.cpp
+++ b/examples/embedded/anomaly/src/BookmarksView.cpp
@@ -54,10 +54,10 @@ BookmarksView::BookmarksView(QWidget *parent)
layout->addWidget(m_iconView);
m_iconView->addItem("www.google.com");
- m_iconView->addItem("qt.nokia.com/doc/4.5");
+ m_iconView->addItem("qt-project.org/doc/qt-5.0");
m_iconView->addItem("news.bbc.co.uk/2/mobile/default.stm");
m_iconView->addItem("mobile.wikipedia.org");
- m_iconView->addItem("qt.nokia.com");
+ m_iconView->addItem("qt.digia.com");
m_iconView->addItem("en.wikipedia.org");
setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
diff --git a/examples/webkit/domtraversal/main.cpp b/examples/webkit/domtraversal/main.cpp
index 8d6f830..014086a 100644
--- a/examples/webkit/domtraversal/main.cpp
+++ b/examples/webkit/domtraversal/main.cpp
@@ -46,6 +46,6 @@ int main(int argc, char *argv[])
QApplication app(argc, argv);
Window window;
window.show();
- window.setUrl(QUrl("http://qt.nokia.com/"));
+ window.setUrl(QUrl("http://qt-project.org/"));
return app.exec();
}
diff --git a/examples/webkit/domtraversal/window.ui b/examples/webkit/domtraversal/window.ui
index 6cdf936..e245aa6 100644
--- a/examples/webkit/domtraversal/window.ui
+++ b/examples/webkit/domtraversal/window.ui
@@ -25,7 +25,7 @@
<widget class="QWebView" name="webView">
<property name="url">
<url>
- <string>http://qt.nokia.com/</string>
+ <string>http://qt-project.org/</string>
</url>
</property>
</widget>
diff --git a/examples/webkit/framecapture/main.cpp b/examples/webkit/framecapture/main.cpp
index 48f13dc..e900313 100644
--- a/examples/webkit/framecapture/main.cpp
+++ b/examples/webkit/framecapture/main.cpp
@@ -54,7 +54,7 @@ int main(int argc, char * argv[])
std::cout << " 'outputfile' is the prefix of the image files to be generated" << std::endl;
std::cout << std::endl;
std::cout << "Example: " << std::endl;
- std::cout << " framecapture qt.nokia.com trolltech.png" << std::endl;
+ std::cout << " framecapture qt-project.org trolltech.png" << std::endl;
std::cout << std::endl;
std::cout << "Result:" << std::endl;
std::cout << " trolltech.png (full page)" << std::endl;
diff --git a/examples/webkit/imageanalyzer/imageanalyzer.cpp b/examples/webkit/imageanalyzer/imageanalyzer.cpp
index c64d278..a031519 100644
--- a/examples/webkit/imageanalyzer/imageanalyzer.cpp
+++ b/examples/webkit/imageanalyzer/imageanalyzer.cpp
@@ -138,7 +138,7 @@ void ImageAnalyzer::fetchURLs()
// HTTP Get image over network.
m_outstandingFetches++;
QNetworkRequest request = QNetworkRequest(URL);
- request.setRawHeader("User-Agent", "Nokia - Custom QT app");
+ request.setRawHeader("User-Agent", "Digia - Custom QT app");
m_network->get(request);
} else {
// Get image from cache