diff options
| author | Kent Hansen <khansen@trolltech.com> | 2009-08-12 14:13:24 (GMT) |
|---|---|---|
| committer | Kent Hansen <khansen@trolltech.com> | 2009-08-12 14:13:24 (GMT) |
| commit | c792951aba5fd897610e199c457846d0b6b0690d (patch) | |
| tree | 8843e93273ce11c9e3afc8574bf5d7e6063ebc74 /tools | |
| parent | a6905066d18c29c55944653678e85698c9babc6e (diff) | |
| parent | fe5d0c32887b17a76c259bea951beaaaad675968 (diff) | |
| download | Qt-c792951aba5fd897610e199c457846d0b6b0690d.zip Qt-c792951aba5fd897610e199c457846d0b6b0690d.tar.gz Qt-c792951aba5fd897610e199c457846d0b6b0690d.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qtscript-jsc-backend
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 34 | ||||
| -rw-r--r-- | tools/qvfb/qtopiakeysym.h | 5 | ||||
| -rw-r--r-- | tools/qvfb/qvfbx11view.cpp | 5 | ||||
| -rw-r--r-- | tools/qvfb/qvfbx11view.h | 5 | ||||
| -rw-r--r-- | tools/qvfb/x11keyfaker.cpp | 5 | ||||
| -rw-r--r-- | tools/qvfb/x11keyfaker.h | 5 |
6 files changed, 38 insertions, 21 deletions
diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index e4e60dc..8c5bec5 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -8,20 +8,32 @@ HTML.postheader = "<table border=\"0\" cellpadding=\"0\" cellspacing=\"0 "<td class=\"postheader\" valign=\"center\">" \ "<a href=\"index.html\">" \ "<font color=\"#004faf\">Home</font></a> ·" \ - " <a href=\"namespaces.html\">" \ - "<font color=\"#004faf\">All Namespaces</font></a> ·" \ - " <a href=\"classes.html\">" \ - "<font color=\"#004faf\">All Classes</font></a> ·" \ - " <a href=\"mainclasses.html\">" \ - "<font color=\"#004faf\">Main Classes</font></a> ·" \ - " <a href=\"groups.html\">" \ - "<font color=\"#004faf\">Grouped Classes</font></a> ·" \ " <a href=\"modules.html\">" \ "<font color=\"#004faf\">Modules</font></a> ·" \ + " <a href=\"classes.html\">" \ + "<font color=\"#004faf\">Classes</font></a> ·" \ " <a href=\"functions.html\">" \ - "<font color=\"#004faf\">Functions</font></a>" \ - "</td>\n" \ - "<td align=\"right\" valign=\"top\" width=\"230\"></td></tr></table>" + "<font color=\"#004faf\">Functions</font></a> ·" \ + " <a href=\"namespaces.html\">" \ + "<font color=\"#004faf\">Namespaces</font></a>" \ + "</td>" \ + "<td class=\"searchBar\" align=\"right\" valign=\"center\">" \ + "<form action=\"http://www.google.com/cse\" id=\"cse-search-box\">" \ + "<div>" \ + "<input type=\"hidden\" name=\"cx\" value=\"000136343326384750312:dhbxnqlakyu\" />" \ + "<input type=\"hidden\" name=\"ie\" value=\"UTF-8\" />" \ + "<input type=\"text\" name=\"q\" size=\"31\" />" \ + "<input type=\"submit\" name=\"sa\" value=\"Search\" />" \ + "</div>" \ + "</form>" \ + \ + "<script type=\"text/javascript\" src=\"http://www.google.com/jsapi\"></script>" \ + "<script type=\"text/javascript\">google.load(\"elements\", \"1\", {packages: \"transliteration\"});</script>" \ + "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/t13n?form=cse-search-box&t13n_langs=en\"></script>" \ + \ + "<script type=\"text/javascript\" src=\"http://www.google.com/coop/cse/brand?form=cse-search-box&lang=en\"></script>"\ + "</td>\n" \ + "</tr></table>" HTML.footer = "<p /><address><hr /><div align=\"center\">\n" \ "<table width=\"100%\" cellspacing=\"0\" border=\"0\"><tr class=\"address\">\n" \ diff --git a/tools/qvfb/qtopiakeysym.h b/tools/qvfb/qtopiakeysym.h index 56bb8cc..887eb1f 100644 --- a/tools/qvfb/qtopiakeysym.h +++ b/tools/qvfb/qtopiakeysym.h @@ -1,8 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Phone Edition of the Qt Toolkit. +** This file is part of the tools module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/qvfb/qvfbx11view.cpp b/tools/qvfb/qvfbx11view.cpp index 292a946..d801b95 100644 --- a/tools/qvfb/qvfbx11view.cpp +++ b/tools/qvfb/qvfbx11view.cpp @@ -1,8 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Phone Edition of the Qt Toolkit. +** This file is part of the tools module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/qvfb/qvfbx11view.h b/tools/qvfb/qvfbx11view.h index 0186368..6b0ee73 100644 --- a/tools/qvfb/qvfbx11view.h +++ b/tools/qvfb/qvfbx11view.h @@ -1,8 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Phone Edition of the Qt Toolkit. +** This file is part of the tools module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/qvfb/x11keyfaker.cpp b/tools/qvfb/x11keyfaker.cpp index 8c262d2..266c9b7 100644 --- a/tools/qvfb/x11keyfaker.cpp +++ b/tools/qvfb/x11keyfaker.cpp @@ -1,8 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Phone Edition of the Qt Toolkit. +** This file is part of the tools module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/tools/qvfb/x11keyfaker.h b/tools/qvfb/x11keyfaker.h index e8256eb..d159382 100644 --- a/tools/qvfb/x11keyfaker.h +++ b/tools/qvfb/x11keyfaker.h @@ -1,8 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 1992-2006 TROLLTECH ASA. All rights reserved. +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the Phone Edition of the Qt Toolkit. +** This file is part of the tools of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |