various cleanups

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>

diff --git a/src/core/global/qglobal.cpp b/src/core/global/qglobal.cpp
index dce7b3b..e38c2c4 100644 (file)
--- a/src/core/global/qglobal.cpp
+++ b/src/core/global/qglobal.cpp
@@ -1570,20 +1570,6 @@ Q_CORE_EXPORT unsigned int qt_int_sqrt(unsigned int n)
 
 static QtMsgHandler handler = 0;                // pointer to debug handler
 
-#if defined(Q_CC_MWERKS) && defined(Q_OS_MACX)
-extern bool qt_is_gui_used;
-static void mac_default_handler(const char *msg)
-{
-    if (qt_is_gui_used) {
-        Str255 pmsg;
-        qt_mac_to_pascal_string(QString::fromAscii(msg), pmsg);
-        DebugStr(pmsg);
-    } else {
-        fprintf(stderr, msg);
-    }
-}
-#endif // Q_CC_MWERKS && Q_OS_MACX
-
 QString qt_error_string(int errorCode)
 {
     const char *s = 0;

diff --git a/src/core/io/qfilesystemwatcher.cpp b/src/core/io/qfilesystemwatcher.cpp
index fcd3f3d..413d96d 100644 (file)
--- a/src/core/io/qfilesystemwatcher.cpp
+++ b/src/core/io/qfilesystemwatcher.cpp
@@ -55,7 +55,7 @@
 #if defined(Q_OS_LINUX)
 #  include "qfilesystemwatcher_inotify_p.h"
 #  include "qfilesystemwatcher_dnotify_p.h"
-#elif defined(Q_OS_FREEBSD) || defined(Q_OS_MAC)
+#elif defined(Q_OS_FREEBSD)
 #  include "qfilesystemwatcher_kqueue_p.h"
 #endif
 

diff --git a/src/core/io/qfsfileengine_unix.cpp b/src/core/io/qfsfileengine_unix.cpp
index cb0c0d6..a6196fe 100644 (file)
--- a/src/core/io/qfsfileengine_unix.cpp
+++ b/src/core/io/qfsfileengine_unix.cpp
@@ -56,9 +56,6 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <errno.h>
-#if !defined(QWS) && defined(Q_OS_MAC)
-# include <qcore_mac_p.h>
-#endif
 
 QT_BEGIN_NAMESPACE
 

diff --git a/src/core/io/qsettings_p.h b/src/core/io/qsettings_p.h
index 906b996..470b57c 100644 (file)
--- a/src/core/io/qsettings_p.h
+++ b/src/core/io/qsettings_p.h
@@ -286,10 +286,6 @@ private:
     void initAccess();
     void syncConfFile(int confFileNo);
     bool writeIniFile(QIODevice &device, const ParsedSettingsMap &map);
-#ifdef Q_OS_MAC
-    bool readPlistFile(const QString &fileName, ParsedSettingsMap *map) const;
-    bool writePlistFile(const QString &fileName, const ParsedSettingsMap &map) const;
-#endif
     void ensureAllSectionsParsed(QConfFile *confFile) const;
     void ensureSectionParsed(QConfFile *confFile, const QSettingsKey &key) const;
 

diff --git a/src/core/plugin/qlibrary.cpp b/src/core/plugin/qlibrary.cpp
index 2a23c78..81210d8 100644 (file)
--- a/src/core/plugin/qlibrary.cpp
+++ b/src/core/plugin/qlibrary.cpp
@@ -55,9 +55,6 @@
 #include <qsettings.h>
 #include <qdatetime.h>
 #include <qcoreapplication_p.h>
-#ifdef Q_OS_MAC
-#  include <qcore_mac_p.h>
-#endif
 #ifndef NO_ERRNO_H
 #include <errno.h>
 #endif // NO_ERROR_H
@@ -73,7 +70,7 @@ QT_BEGIN_NAMESPACE
 #  define QLIBRARY_AS_DEBUG true
 #endif
 
-#if defined(Q_OS_UNIX) && !defined(Q_OS_MAC)
+#if defined(Q_OS_UNIX)
 // We don't use separate debug and release libs on UNIX, so we want
 // to allow loading plugins, regardless of how they were built.
 #  define QT_NO_DEBUG_PLUGIN_CHECK

diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index 72d443e..04574fc 100644 (file)
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2423,40 +2423,7 @@ const QMetaObject *QDeclarativeEnginePrivate::metaObjectForType(int t) const
 
 bool QDeclarative_isFileCaseCorrect(const QString &fileName)
 {
-#if defined(Q_OS_MAC) || defined(Q_OS_WIN32)
-    QFileInfo info(fileName);
-
-    QString absolute = info.absoluteFilePath();
-
-#if defined(Q_OS_MAC)
-    QString canonical = info.canonicalFilePath();
-#elif defined(Q_OS_WIN32)
-    wchar_t buffer[1024];
-
-    DWORD rv = ::GetShortPathName((wchar_t*)absolute.utf16(), buffer, 1024);
-    if (rv == 0 || rv >= 1024) return true;
-    rv = ::GetLongPathName(buffer, buffer, 1024);
-    if (rv == 0 || rv >= 1024) return true;
-
-    QString canonical((QChar *)buffer);
-#endif
-
-    int absoluteLength = absolute.length();
-    int canonicalLength = canonical.length();
-
-    int length = qMin(absoluteLength, canonicalLength);
-    for (int ii = 0; ii < length; ++ii) {
-        const QChar &a = absolute.at(absoluteLength - 1 - ii);
-        const QChar &c = canonical.at(canonicalLength - 1 - ii);
-
-        if (a.toLower() != c.toLower())
-            return true;
-        if (a != c)
-            return false;
-    }
-#else
     Q_UNUSED(fileName)
-#endif
     return true;
 }
 

diff --git a/src/gui/dialogs/qfilesystemmodel.cpp b/src/gui/dialogs/qfilesystemmodel.cpp
index de91ed1..9d65d14 100644 (file)
--- a/src/gui/dialogs/qfilesystemmodel.cpp
+++ b/src/gui/dialogs/qfilesystemmodel.cpp
@@ -805,13 +805,8 @@ QVariant QFileSystemModel::headerData(int section, Qt::Orientation orientation,
             break;
     case 1: returnValue = tr("Size");
             break;
-    case 2: returnValue =
-#ifdef Q_OS_MAC
-                   tr("Kind", "Match OS X Finder");
-#else
-                   tr("Type", "All other platforms");
-#endif
-           break;
+    case 2: returnValue = tr("Type", "All other platforms");
+            break;
     // Windows   - Type
     // OS X      - Kind
     // Konqueror - File Type

diff --git a/src/plugins/accessible/widgets/simplewidgets.cpp b/src/plugins/accessible/widgets/simplewidgets.cpp
index 90e2930..5c0bdad 100644 (file)
--- a/src/plugins/accessible/widgets/simplewidgets.cpp
+++ b/src/plugins/accessible/widgets/simplewidgets.cpp
@@ -57,10 +57,6 @@
 #include <qstyle.h>
 #include <qstyleoption.h>
 
-#ifdef Q_OS_MAC
-#include <qfocusframe.h>
-#endif
-
 QT_BEGIN_NAMESPACE
 
 #ifndef QT_NO_ACCESSIBILITY

diff --git a/src/scripttools/debugging/qscriptbreakpointswidget.cpp b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
index d33491f..537726c 100644 (file)
--- a/src/scripttools/debugging/qscriptbreakpointswidget.cpp
+++ b/src/scripttools/debugging/qscriptbreakpointswidget.cpp
@@ -66,17 +66,12 @@ class QScriptNewBreakpointWidget : public QWidget
 public:
     QScriptNewBreakpointWidget(QWidget *parent = Q_NULLPTR)
         : QWidget(parent) {
-       QString system = QLatin1String("win");
         QHBoxLayout *hboxLayout = new QHBoxLayout(this);
-#ifdef Q_OS_MAC
-        system = QLatin1String("mac");
-#else
         hboxLayout->setSpacing(6);
         hboxLayout->setMargin(0);
-#endif
 
         toolClose = new QToolButton(this);
-        toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/closetab.png").arg(system)));
+        toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/win/closetab.png")));
         toolClose->setAutoRaise(true);
         toolClose->setText(tr("Close"));
         hboxLayout->addWidget(toolClose);
@@ -89,7 +84,7 @@ public:
         hboxLayout->addWidget(fileNameEdit);
 
         toolOk = new QToolButton(this);
-        toolOk->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/plus.png").arg(system)));
+        toolOk->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/win/plus.png")));
         toolOk->setAutoRaise(true);
         toolOk->setEnabled(false);
         hboxLayout->addWidget(toolOk);

diff --git a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
index 61d1245..b2b4e6b 100644 (file)
--- a/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
+++ b/src/scripttools/debugging/qscriptdebuggercodefinderwidget.cpp
@@ -126,17 +126,12 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent
         *new QScriptDebuggerCodeFinderWidgetPrivate, parent, 0)
 {
     Q_D(QScriptDebuggerCodeFinderWidget);
-    QString system = QLatin1String("win");
     QHBoxLayout *hboxLayout = new QHBoxLayout(this);
-#ifdef Q_OS_MAC
-    system = QLatin1String("mac");
-#else
     hboxLayout->setSpacing(6);
     hboxLayout->setMargin(0);
-#endif
 
     d->toolClose = new QToolButton(this);
-    d->toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/closetab.png").arg(system)));
+    d->toolClose->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/win/closetab.png")));
     d->toolClose->setAutoRaise(true);
     d->toolClose->setText(tr("Close"));
     hboxLayout->addWidget(d->toolClose);
@@ -153,14 +148,14 @@ QScriptDebuggerCodeFinderWidget::QScriptDebuggerCodeFinderWidget(QWidget *parent
     d->toolPrevious->setAutoRaise(true);
     d->toolPrevious->setText(tr("Previous"));
     d->toolPrevious->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    d->toolPrevious->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/previous.png").arg(system)));
+    d->toolPrevious->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/win/previous.png")));
     hboxLayout->addWidget(d->toolPrevious);
 
     d->toolNext = new QToolButton(this);
     d->toolNext->setAutoRaise(true);
     d->toolNext->setText(tr("Next"));
     d->toolNext->setToolButtonStyle(Qt::ToolButtonTextBesideIcon);
-    d->toolNext->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/%1/next.png").arg(system)));
+    d->toolNext->setIcon(QIcon(QString::fromUtf8(":/qt/scripttools/debugging/images/win/next.png")));
     hboxLayout->addWidget(d->toolNext);
 
     d->checkCase = new QCheckBox(tr("Case Sensitive"), this);

diff --git a/src/scripttools/debugging/scripttools_debugging.qrc b/src/scripttools/debugging/scripttools_debugging.qrc
index ba0aba8..be11d38 100644 (file)
--- a/src/scripttools/debugging/scripttools_debugging.qrc
+++ b/src/scripttools/debugging/scripttools_debugging.qrc
@@ -46,10 +46,6 @@
 <file>images/breakpoint.png</file>
 <file>images/d_breakpoint.png</file>
 
-<file>images/mac/closetab.png</file>
-<file>images/mac/next.png</file>
-<file>images/mac/previous.png</file>
-<file>images/mac/plus.png</file>
 <file>images/win/closetab.png</file>
 <file>images/win/next.png</file>
 <file>images/win/previous.png</file>

diff --git a/src/shared/findwidget/abstractfindwidget.cpp b/src/shared/findwidget/abstractfindwidget.cpp
index f64399a..cf1cfca 100644 (file)
--- a/src/shared/findwidget/abstractfindwidget.cpp
+++ b/src/shared/findwidget/abstractfindwidget.cpp
@@ -101,10 +101,8 @@ AbstractFindWidget::AbstractFindWidget(FindFlags flags, QWidget *parent)
     } else {
         topLayOut = layOut = new QHBoxLayout(this);
     }
-#ifndef Q_OS_MAC
     topLayOut->setSpacing(6);
     topLayOut->setMargin(0);
-#endif
 
     m_toolClose = new QToolButton(this);
     m_toolClose->setIcon(createIconSet(QLatin1String("closetab.png")));

diff --git a/src/test/qbenchmark_p.h b/src/test/qbenchmark_p.h
index c8348c9..c2c038b 100644 (file)
--- a/src/test/qbenchmark_p.h
+++ b/src/test/qbenchmark_p.h
@@ -57,7 +57,7 @@
 
 #include <QtCore/qglobal.h>
 
-#if (defined(Q_OS_LINUX) || defined Q_OS_MAC) && !defined(QT_NO_PROCESS)
+#if defined(Q_OS_LINUX) && !defined(QT_NO_PROCESS)
 #define QTESTLIB_USE_VALGRIND 
 #else
 #undef QTESTLIB_USE_VALGRIND

diff --git a/src/tools/designer/qdesigner_actions.cpp b/src/tools/designer/qdesigner_actions.cpp
index 2d693cf..3f64723 100644 (file)
--- a/src/tools/designer/qdesigner_actions.cpp
+++ b/src/tools/designer/qdesigner_actions.cpp
@@ -266,11 +266,8 @@ QDesignerActions::QDesignerActions(QDesignerWorkbench *workbench)
     connect(m_saveFormAsAction, SIGNAL(triggered()), this, SLOT(saveFormAs()));
     m_fileActions->addAction(m_saveFormAsAction);
 
-#ifdef Q_OS_MAC
-    m_saveAllFormsAction->setShortcut(tr("ALT+CTRL+S"));
-#else
+
     m_saveAllFormsAction->setShortcut(tr("CTRL+SHIFT+S")); // Commonly "Save As" on Mac
-#endif
     connect(m_saveAllFormsAction, SIGNAL(triggered()), this, SLOT(saveAllForms()));
     m_fileActions->addAction(m_saveAllFormsAction);
 

diff --git a/src/tools/lconvert/lconvert.1 b/src/tools/lconvert/lconvert.1
index 411d7c7..13887da 100644 (file)
--- a/src/tools/lconvert/lconvert.1
+++ b/src/tools/lconvert/lconvert.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "LCONVERT 1"
-.TH LCONVERT 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH LCONVERT 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/lrelease/lrelease.1 b/src/tools/lrelease/lrelease.1
index 1bbef5b..20bb296 100644 (file)
--- a/src/tools/lrelease/lrelease.1
+++ b/src/tools/lrelease/lrelease.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "LRELEASE 1"
-.TH LRELEASE 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH LRELEASE 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/lupdate/lupdate.1 b/src/tools/lupdate/lupdate.1
index 7d15786..df22aca 100644 (file)
--- a/src/tools/lupdate/lupdate.1
+++ b/src/tools/lupdate/lupdate.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "LUPDATE 1"
-.TH LUPDATE 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH LUPDATE 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/moc/moc.1 b/src/tools/moc/moc.1
index f7faeb4..4de377c 100644 (file)
--- a/src/tools/moc/moc.1
+++ b/src/tools/moc/moc.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "MOC 1"
-.TH MOC 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH MOC 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbus.1 b/src/tools/qdbus/qdbus.1
index b6a2fd8..ed1f624 100644 (file)
--- a/src/tools/qdbus/qdbus.1
+++ b/src/tools/qdbus/qdbus.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "QDBUS 1"
-.TH QDBUS 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH QDBUS 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbuscpp2xml.1 b/src/tools/qdbus/qdbuscpp2xml.1
index 937edee..c6af05a 100644 (file)
--- a/src/tools/qdbus/qdbuscpp2xml.1
+++ b/src/tools/qdbus/qdbuscpp2xml.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "QDBUSCPP2XML 1"
-.TH QDBUSCPP2XML 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH QDBUSCPP2XML 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qdbus/qdbusxml2cpp.1 b/src/tools/qdbus/qdbusxml2cpp.1
index 56075cf..2880e8e 100644 (file)
--- a/src/tools/qdbus/qdbusxml2cpp.1
+++ b/src/tools/qdbus/qdbusxml2cpp.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "QDBUSXML2CPP 1"
-.TH QDBUSXML2CPP 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH QDBUSXML2CPP 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/qscript/qscript.1 b/src/tools/qscript/qscript.1
index a5eccad..2a84057 100644 (file)
--- a/src/tools/qscript/qscript.1
+++ b/src/tools/qscript/qscript.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,20 +54,16 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "QSCRIPT 1"

diff --git a/src/tools/rcc/rcc.1 b/src/tools/rcc/rcc.1
index 11c9144..17d3f84 100644 (file)
--- a/src/tools/rcc/rcc.1
+++ b/src/tools/rcc/rcc.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "RCC 1"
-.TH RCC 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH RCC 1 "2016-11-05" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l

diff --git a/src/tools/uic/uic.1 b/src/tools/uic/uic.1
index 8f1c337..c4fa28e 100644 (file)
--- a/src/tools/uic/uic.1
+++ b/src/tools/uic/uic.1
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 2.28 (Pod::Simple 3.29)
+.\" Automatically generated by Pod::Man 4.09 (Pod::Simple 3.35)
 .\"
 .\" Standard preamble:
 .\" ========================================================================
@@ -46,7 +46,7 @@
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .\"
-.\" If the F register is turned on, we'll generate index entries on stderr for
+.\" If the F register is >0, we'll generate index entries on stderr for
 .\" titles (.TH), headers (.SH), subsections (.SS), items (.Ip), and index
 .\" entries marked with X<> in POD.  Of course, you'll have to process the
 .\" output yourself in some meaningful fashion.
@@ -54,24 +54,20 @@
 .\" Avoid warning from groff about undefined register 'F'.
 .de IX
 ..
-.nr rF 0
-.if \n(.g .if rF .nr rF 1
-.if (\n(rF:(\n(.g==0)) \{
-.    if \nF \{
-.        de IX
-.        tm Index:\\$1\t\\n%\t"\\$2"
+.if !\nF .nr F 0
+.if \nF>0 \{\
+.    de IX
+.    tm Index:\\$1\t\\n%\t"\\$2"
 ..
-.        if !\nF==2 \{
-.            nr % 0
-.            nr F 2
-.        \}
+.    if !\nF==2 \{\
+.        nr % 0
+.        nr F 2
 .    \}
 .\}
-.rr rF
 .\" ========================================================================
 .\"
 .IX Title "UIC 1"
-.TH UIC 1 "2016-08-01" "Katie 4.9.0" "Katie Manual"
+.TH UIC 1 "2018-07-10" "Katie 4.9.0" "Katie Manual"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
@@ -83,7 +79,9 @@ uic \- Qt User Interface Compiler
 uic [options] <user\-interface\-file>
 .SH "DESCRIPTION"
 .IX Header "DESCRIPTION"
-\&\s-1TODO\s0
+uic reads a user interface definition (.ui) file in \s-1XML\s0 as generated by
+Qt Designer and creates corresponding \*(C+ header or source files. It also
+generates an image file that embeds raw image data in \*(C+ source code.
 .SH "OPTIONS"
 .IX Header "OPTIONS"
 .Vb 3

diff --git a/src/tools/uic/uic.pod b/src/tools/uic/uic.pod
index f2d8050..00b6322 100644 (file)
--- a/src/tools/uic/uic.pod
+++ b/src/tools/uic/uic.pod
@@ -8,7 +8,9 @@ uic [options] <user-interface-file>
 
 =head1 DESCRIPTION
 
-TODO
+uic reads a user interface definition (.ui) file in XML as generated by
+Qt Designer and creates corresponding C++ header or source files. It also
+generates an image file that embeds raw image data in C++ source code.
 
 =head1 OPTIONS
 

diff --git a/src/uitools/abstractformbuilder.cpp b/src/uitools/abstractformbuilder.cpp
index 160db51..c331836 100644 (file)
--- a/src/uitools/abstractformbuilder.cpp
+++ b/src/uitools/abstractformbuilder.cpp
@@ -641,30 +641,6 @@ void QAbstractFormBuilder::layoutInfo(DomLayout *ui_layout, QObject *parent, int
     if (const DomProperty *p = properties.value(strings.spacingProperty, 0))
         spac = p->elementNumber();
 
-#ifdef Q_OS_MAC
-    // here we recognize UI file < 4.3 (no we don't store margin property)
-    if (mar != INT_MIN) {
-        const int defaultMargin = parent->inherits("QLayoutWidget") ? 0 : 9;
-        if (mar == defaultMargin)
-            mar = INT_MIN;
-        if (spac == 6)
-            spac = INT_MIN;
-
-        if (mar == INT_MIN || spac == INT_MIN) {
-            QList<DomProperty *> properties = ui_layout->elementProperty();
-            QMutableListIterator<DomProperty *> it(properties);
-            while (it.hasNext()) {
-                DomProperty *prop = it.next();
-                if ((mar == INT_MIN && prop->attributeName() == strings.marginProperty) ||
-                        (spac == INT_MIN && prop->attributeName() == strings.spacingProperty)) {
-                    it.remove();
-                    delete prop;
-                }
-            }
-            ui_layout->setElementProperty(properties);
-        }
-    }
-#endif
     if (margin)
         *margin = mar;
     if (spacing)