Add examples.pro

+ misc cleanups.

Change-Id: If0cae675156199db6f04dcdabe91abd9dac541ad
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>

6 files changed, 17 insertions, 13 deletions

diff --git a/examples/embeddedqwindow/embeddedqwindow.pro b/examples/embeddedqwindow/embeddedqwindow.pro
index 73a0ae4..99c1ed2 100644
--- a/examples/embeddedqwindow/embeddedqwindow.pro
+++ b/examples/embeddedqwindow/embeddedqwindow.pro
@@ -7,5 +7,3 @@ LIBS += -framework Cocoa
 
 QT += gui widgets 
 QT += widgets-private gui-private core-private
-
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/examples/examples.pro b/examples/examples.pro
new file mode 100644
index 0000000..6ec6651
--- /dev/null
+++ b/examples/examples.pro
@@ -0,0 +1,7 @@
+TEMPLATE = subdirs
+SUBDIRS = embeddedqwindow \
+          macfunctions \
+          macpasteboardmime	\
+          macunifiedtoolbar	\
+          qtmacnativewidget \
+          
\ No newline at end of file
diff --git a/examples/qtmacnativewidget/main.mm b/examples/qtmacnativewidget/main.mm
index fd3cc87..c40518a 100644
--- a/examples/qtmacnativewidget/main.mm
+++ b/examples/qtmacnativewidget/main.mm
@@ -58,6 +58,7 @@ public:
     void paintEvent(QPaintEvent *event)
     {
         QPainter p(this);
+        Q_UNUSED(event);
         QRect rect(QPoint(0, 0), size());
         qDebug() << "Painting geometry" << rect;
         p.fillRect(rect, QColor(133, 50, 50));
diff --git a/examples/qtmacnativewidget/qtmacnativewidget.pro b/examples/qtmacnativewidget/qtmacnativewidget.pro
index 07d271e..84726f1 100644
--- a/examples/qtmacnativewidget/qtmacnativewidget.pro
+++ b/examples/qtmacnativewidget/qtmacnativewidget.pro
@@ -7,5 +7,3 @@ LIBS += -framework Cocoa
 
 QT += gui widgets
 QT += widgets-private gui-private core-private
-
-#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0
diff --git a/src/qtmacextras.pri b/src/qtmacextras.pri
index 3675461..ac51030 100644
--- a/src/qtmacextras.pri
+++ b/src/qtmacextras.pri
@@ -2,6 +2,11 @@ QT += widgets gui-private
 INCLUDEPATH += $$PWD
 DEPENDPATH += $$PWD
 
+OBJECTS_DIR = .obj
+MOC_DIR = .moc
+QMAKE_CXXFLAGS += -Werror
+QMAKE_OBJCFLAGS += -Werror
+
 # QtMacUnifiedToolBar
 HEADERS += $$PWD/qtmacunifiedtoolbar.h  \
            $$PWD/qtmactoolbardelegate.h \
@@ -27,13 +32,6 @@ OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
 HEADERS += $$PWD/qtmacfunctions.h
 OBJECTIVE_SOURCES += $$PWD/qtmacfunctions.mm
 
-minQtVersion(5, 0, 1) {
-    HEADERS += $$PWD/qtmacfunctions.h
-    OBJECTIVE_SOURCES += $$PWD/qtmacfunctions.mm
-} else {
-    message("qt_mac_set_dock_menu requires Qt 5.0.1 and will be exculded from this build. You have Qt" $$QT_VERSION)
-}
-
 # QtMacNativeWidget
 HEADERS += $$PWD/qtmacnativewidget.h
 OBJECTIVE_SOURCES += $$PWD/qtmacnativewidget.mm
diff --git a/src/qtmacnativewidget.mm b/src/qtmacnativewidget.mm
index b1bb5a1..83add40 100644
--- a/src/qtmacnativewidget.mm
+++ b/src/qtmacnativewidget.mm
@@ -49,8 +49,8 @@
 
 /*!
     \class QtMacNativeWidget
-    \brief The QtMacNativeWidget class provides a widget for Mac OS X that provides a way to put Qt widgets into Carbon
-    or Cocoa hierarchies depending on how Qt was configured.
+    \brief The QtMacNativeWidget class provides a widget for Mac OS X that provides a way to put Qt widgets
+    into Cocoa hierarchies.
 
     QtMacNativeWidget bridges the gap between NSViews and QWidgets and makes it possible to put a
     hierarchy of Qt widgets into a non-Qt window or view.
@@ -91,6 +91,8 @@ NSView *getEmbeddableView(QWindow *qtWindow)
 QtMacNativeWidget::QtMacNativeWidget(NSView *parentView)
     : QWidget(0, Qt::Window | Qt::SubWindow)
 {
+    Q_UNUSED(parentView);
+
     //d_func()->topData()->embedded = true;
     setPalette(QPalette(Qt::transparent));
     setAttribute(Qt::WA_SetPalette, false);