diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:15:14 +0100 |
|---|---|---|
| committer | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-11-08 18:15:14 +0100 |
| commit | 1dcc307325260b02e46075bf230b3dd12236cc14 (patch) | |
| tree | 261b51ef9ce4c7c2797c52d0763623c646a2bf7f | |
| parent | 279dd24f0b834b2f5e15aca2fd22bb952df30438 (diff) | |
| parent | 1906da15d32340571a04d3d7e2e190bfee26f213 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I6f16c9f6c802300b076765d543d96c8b9a8b4da1
| -rw-r--r-- | examples/macextras/macfunctions/main.cpp | 4 | ||||
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 2 | ||||
| -rw-r--r-- | src/macextras/macextras-lib.pri | 4 | ||||
| -rw-r--r-- | src/macextras/qmacfunctions.h | 2 | ||||
| -rw-r--r-- | src/macextras/qmacfunctions.mm | 2 | ||||
| -rw-r--r-- | src/macextras/qmacpasteboardmime.mm | 3 |
6 files changed, 8 insertions, 9 deletions
diff --git a/examples/macextras/macfunctions/main.cpp b/examples/macextras/macfunctions/main.cpp index a1563ba..11c98c8 100644 --- a/examples/macextras/macfunctions/main.cpp +++ b/examples/macextras/macfunctions/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QGuiApplication> +#include <QApplication> #include <QMenu> #include <QPixmap> #include <QWidget> @@ -48,7 +48,7 @@ int main(int argc, char **argv) { - QGuiApplication app(argc, argv); + QApplication app(argc, argv); QWidget widget; widget.show(); diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 2cc1c60..1b0f4cd 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -2,7 +2,7 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) project = QtMacExtras description = Qt Mac Extras Reference Documentation -url = http://qt-project.org/doc/qt-$QT_VER/qtmacextras +url = http://qt-project.org/doc/qt-$QT_VER version = $QT_VERSION exampledirs += ../../../examples/macextras \ diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri index 8240436..388a905 100644 --- a/src/macextras/macextras-lib.pri +++ b/src/macextras/macextras-lib.pri @@ -9,7 +9,7 @@ mac { OBJECTIVE_SOURCES += \ $$PWD/qmacfunctions_ios.mm - LIBS *= -framework UIKit + LIBS_PRIVATE += -framework UIKit } else { PRIVATE_HEADERS += \ $$PWD/qmacnativetoolbar_p.h \ @@ -29,7 +29,7 @@ mac { OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm } - LIBS *= -framework AppKit + LIBS_PRIVATE += -framework AppKit } } diff --git a/src/macextras/qmacfunctions.h b/src/macextras/qmacfunctions.h index 0afeb1c..c624d15 100644 --- a/src/macextras/qmacfunctions.h +++ b/src/macextras/qmacfunctions.h @@ -43,7 +43,7 @@ #define QMACFUNCTIONS_H #if 0 -#pragma qt_class(QMacFunctions) +#pragma qt_class(QtMac) #endif #include "qmacextrasglobal.h" diff --git a/src/macextras/qmacfunctions.mm b/src/macextras/qmacfunctions.mm index 0f81cb2..187c6ee 100644 --- a/src/macextras/qmacfunctions.mm +++ b/src/macextras/qmacfunctions.mm @@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE \inmodule QtMacExtras \since 5.2 \brief The QtMac namespace contains miscellaneous functionality specific to Mac OS X and iOS operating systems. - \inheaderfile QMacFunctions + \inheaderfile QtMac */ namespace QtMac { diff --git a/src/macextras/qmacpasteboardmime.mm b/src/macextras/qmacpasteboardmime.mm index ee51bfb..edf8de6 100644 --- a/src/macextras/qmacpasteboardmime.mm +++ b/src/macextras/qmacpasteboardmime.mm @@ -41,14 +41,13 @@ #include <Cocoa/Cocoa.h> #include "qmacpasteboardmime.h" +#include "qmacfunctions_p.h" #include <QtCore/qlogging.h> #include <qpa/qplatformnativeinterface.h> QT_BEGIN_NAMESPACE -extern QPlatformNativeInterface::NativeResourceForIntegrationFunction resolvePlatformFunction(const QByteArray &functionName); - /*! \fn void qRegisterDraggedTypes(const QStringList &types) \relates QMacPasteboardMime |