diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/assistant/compat/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | tools/assistant/tools/assistant/remotecontrol.cpp | 6 | ||||
| -rw-r--r-- | tools/qdoc3/cppcodeparser.cpp | 5 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 34 | ||||
| -rw-r--r-- | tools/xmlpatterns/xmlpatterns.pro | 2 | ||||
| -rw-r--r-- | tools/xmlpatternsvalidator/xmlpatternsvalidator.pro | 2 |
6 files changed, 33 insertions, 18 deletions
diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp index 353efdb..13b555e 100644 --- a/tools/assistant/compat/mainwindow.cpp +++ b/tools/assistant/compat/mainwindow.cpp @@ -401,6 +401,7 @@ QString MainWindow::urlifyFileName(const QString &fileName) return name; } +#ifndef QT_NO_PRINTER class PrintThread : public QThread { QPrinter _printer; @@ -436,6 +437,7 @@ protected: _document = 0; } }; +#endif //QT_NO_PRINTER void MainWindow::on_actionFilePrint_triggered() { diff --git a/tools/assistant/tools/assistant/remotecontrol.cpp b/tools/assistant/tools/assistant/remotecontrol.cpp index b72d7e8..7867ba0 100644 --- a/tools/assistant/tools/assistant/remotecontrol.cpp +++ b/tools/assistant/tools/assistant/remotecontrol.cpp @@ -78,6 +78,8 @@ void StdInListenerWin::run() bool ok = true; char chBuf[4096]; DWORD dwRead; + +#ifndef Q_WS_WINCE HANDLE hStdin, hStdinDup; hStdin = GetStdHandle(STD_INPUT_HANDLE); @@ -89,6 +91,10 @@ void StdInListenerWin::run() 0, false, DUPLICATE_SAME_ACCESS); CloseHandle(hStdin); +#else + HANDLE hStdinDup; + hStdinDup = stdin; +#endif while (ok) { ok = ReadFile(hStdinDup, chBuf, 4096, &dwRead, NULL); diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index ca12e92..ebe5ec9 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1724,9 +1724,6 @@ bool CppCodeParser::matchProperty(InnerNode *parent) value = "?"; } - /* - Task 259071 requires work here. See gui/widgets/qdatetime.h, for example. - */ if (key == "READ") tre->addPropertyFunction(property, value, PropertyNode::Getter); else if (key == "WRITE") @@ -1737,9 +1734,11 @@ bool CppCodeParser::matchProperty(InnerNode *parent) property->setDesignable(value.toLower() == "true"); else if (key == "RESET") tre->addPropertyFunction(property, value, PropertyNode::Resetter); +#if 0 else if (key == "NOTIFY") { tre->addPropertyFunction(property, value, PropertyNode::Notifier); } +#endif } match(Tok_RightParen); return true; 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/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro index 9c1aac1..1c5ab2c 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -27,5 +27,3 @@ HEADERS = main.h \ qapplicationargumentparser.cpp \ qcoloringmessagehandler_p.h \ qcoloroutput_p.h - -include(../src/common.pri) diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro index dd5bd37..8491129 100644 --- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro +++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro @@ -15,5 +15,3 @@ CONFIG -= app_bundle SOURCES = main.cpp HEADERS = main.h - -include(../src/common.pri) |