From 58ed05c33076a32a66e0477d86843e38034744f2 Mon Sep 17 00:00:00 2001 From: Thomas Zander Date: Tue, 8 Dec 2009 16:28:33 +0100 Subject: Follow Qt rebranding and use the proper names / sites. --- CMakeLists.txt | 2 +- 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 @@ - - QtSoftware + + Qt sit WebKit.org @@ -10,8 +10,8 @@ rekonq site - - Trolltech Labs + + Qt Labs KDE-Apps.org -- cgit v1.2.1 From 66836b1ca6d8d5dfcdf4d48dabc51b7709d6e456 Mon Sep 17 00:00:00 2001 From: matgic78 Date: Wed, 9 Dec 2009 17:12:38 +0100 Subject: Rewrite NewTabPage to use QWebElement for page generation --- src/data/home.html | 30 +++++- src/mainwindow.cpp | 7 +- src/rekonqpage/newtabpage.cpp | 217 +++++++++++++++++++++--------------------- src/rekonqpage/newtabpage.h | 36 ++++--- 4 files changed, 159 insertions(+), 131 deletions(-) diff --git a/src/data/home.html b/src/data/home.html index f99d0df1..9d8f390f 100644 --- a/src/data/home.html +++ b/src/data/home.html @@ -2,7 +2,7 @@ -%1 +