diff options
| author | Andrea Diamantini <adjam7@gmail.com> | 2009-12-10 01:15:08 +0100 | 
|---|---|---|
| committer | Andrea Diamantini <adjam7@gmail.com> | 2009-12-10 01:15:08 +0100 | 
| commit | 60069a8ffc7f8dc816dd4beacf398965ff363b9a (patch) | |
| tree | 55d6121a365e3194f1ab7756010ef3d3b4ee5db1 | |
| parent | Merge commit 'refs/merge-requests/66' of git://gitorious.org/rekonq/mainline ... (diff) | |
| parent | Follow Qt rebranding and use the proper names / sites. (diff) | |
| download | rekonq-60069a8ffc7f8dc816dd4beacf398965ff363b9a.tar.xz | |
Merge commit 'refs/merge-requests/64' of git://gitorious.org/rekonq/mainline
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/data/defaultbookmarks.xbel | 8 | 
2 files changed, 5 insertions, 5 deletions
| diff --git a/CMakeLists.txt b/CMakeLists.txt index 89d0b535..a89dc171 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,7 @@ ELSE(QT_FOUND)      MESSAGE(STATUS " Qt library found...................... NO")      MESSAGE(STATUS "")      MESSAGE(SEND_ERROR " rekonq needs at least Qt ${QT_MIN_VERSION}. Please install it and try compiling again.") -    MESSAGE(STATUS " Qt website is at http://www.qtsoftware.com") +    MESSAGE(STATUS " Qt website is at http://qt.nokia.com")      MESSAGE(STATUS "")  ENDIF(QT_FOUND) diff --git a/src/data/defaultbookmarks.xbel b/src/data/defaultbookmarks.xbel index b4919c5c..4419f223 100644 --- a/src/data/defaultbookmarks.xbel +++ b/src/data/defaultbookmarks.xbel @@ -1,8 +1,8 @@  <?xml version="1.0" encoding="UTF-8"?>  <!DOCTYPE xbel>  <xbel version="1.0"> -    <bookmark href="http://qtsoftware.com/"> -        <title>QtSoftware</title> +    <bookmark href="http://qt.nokia.com/"> +        <title>Qt sit</title>      </bookmark>      <bookmark href="http://webkit.org/">          <title>WebKit.org</title> @@ -10,8 +10,8 @@      <bookmark href="http://rekonq.sourceforge.net/">          <title>rekonq site</title>      </bookmark> -    <bookmark href="http://labs.trolltech.com/"> -        <title>Trolltech Labs</title> +    <bookmark href="http://labs.qt.nokia.com/"> +        <title>Qt Labs</title>      </bookmark>      <bookmark href="http://kde-apps.org/">          <title>KDE-Apps.org</title> | 
