summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Smith <msmith@trolltech.com>2009-06-09 13:54:19 (GMT)
committerMartin Smith <msmith@trolltech.com>2009-06-09 13:54:56 (GMT)
commit4d7a1cbb060a7fe933f674e1a9ebaa9e81fe2896 (patch)
treeca08ecc3d530f736ffb57a6c5a26f79fe2642a40
parent8e189954eec4a3bebf49fa84f659e59e455a936e (diff)
downloadQt-4d7a1cbb060a7fe933f674e1a9ebaa9e81fe2896.zip
Qt-4d7a1cbb060a7fe933f674e1a9ebaa9e81fe2896.tar.gz
Qt-4d7a1cbb060a7fe933f674e1a9ebaa9e81fe2896.tar.bz2
qdoc: The gray version.
-rw-r--r--src/corelib/kernel/qtimer.cpp2
-rw-r--r--tools/qdoc3/htmlgenerator.cpp2
-rw-r--r--tools/qdoc3/test/classic.css49
3 files changed, 44 insertions, 9 deletions
diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp
index 8ca53b9..29bdf7e 100644
--- a/src/corelib/kernel/qtimer.cpp
+++ b/src/corelib/kernel/qtimer.cpp
@@ -251,7 +251,7 @@ void QTimer::stop()
/*!
- \reimp
+ \reimp
*/
void QTimer::timerEvent(QTimerEvent *e)
{
diff --git a/tools/qdoc3/htmlgenerator.cpp b/tools/qdoc3/htmlgenerator.cpp
index 0c21534..fb33de4 100644
--- a/tools/qdoc3/htmlgenerator.cpp
+++ b/tools/qdoc3/htmlgenerator.cpp
@@ -2349,8 +2349,6 @@ QString HtmlGenerator::highlightedCode(const QString& markedCode,
// replace all <@link> tags: "(<@link node=\"([^\"]+)\">).*(</@link>)"
static const QString linkTag("link");
- if (src.contains("setAcceptDrops"))
- qDebug() << "SRC:" << src;
bool done = false;
for (int i = 0, n = src.size(); i < n;) {
if (src.at(i) == charLangle && src.at(i + 1).unicode() == '@') {
diff --git a/tools/qdoc3/test/classic.css b/tools/qdoc3/test/classic.css
index 85bb348..9c59c81 100644
--- a/tools/qdoc3/test/classic.css
+++ b/tools/qdoc3/test/classic.css
@@ -14,12 +14,49 @@ H3 {
h3.fn,span.fn
{
- background-color: #e0eff6;
+ background-color: #eee;
border-width: 1px;
border-style: solid;
- border-color: #3388be #3388be #e9f8ff #3388be;
+ border-color: #ddd #ddd #ddd #ddd ;
font-weight: bold;
padding: 6px 0px 6px 10px;
+ margin: 42px 0px 0px 0px;
+}
+
+hr {
+ border: 0;
+ color: #9E9E9E;
+ background-color: #ccc;
+ height: 1px;
+ width: 100%;
+ text-align: left;
+ margin: 34px 0px 34px 0px;
+}
+
+table {
+ border-width: 1px 1px 1px 1px;
+ border-style: solid;
+ border-color: #dddddd;
+ border-collapse: collapse;
+ background-color: #f0f0f0;
+ margin-left: 1.5%;
+ width: 97%
+}
+
+table th {
+ border-width: 1px 1px 1px 2px;
+ padding: 4px;
+ border-style: solid;
+ border-color: #444;
+ color:white;
+ background-color:#444;
+}
+
+p {
+ margin-left: 1.5%;
+ margin-top: 8px;
+ width: 97%
+ margin-bottom: 8px;
}
a:link
@@ -66,7 +103,7 @@ body
table td.memItemLeft {
width: 200px;
- padding: 1px 0px 0px 8px;
+ padding: 2px 0px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
@@ -76,7 +113,7 @@ table td.memItemLeft {
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
- border-top-style: solid;
+ border-top-style: none;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;
@@ -85,7 +122,7 @@ table td.memItemLeft {
white-space: nowrap
}
table td.memItemRight {
- padding: 1px 8px 0px 8px;
+ padding: 2px 8px 0px 8px;
margin: 4px;
border-top-width: 1px;
border-right-width: 1px;
@@ -95,7 +132,7 @@ table td.memItemRight {
border-right-color: #E0E0E0;
border-bottom-color: #E0E0E0;
border-left-color: #E0E0E0;
- border-top-style: solid;
+ border-top-style: none;
border-right-style: none;
border-bottom-style: none;
border-left-style: none;