Structure like a proper Qt module.

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

29 files changed, 61 insertions, 83 deletions

diff --git a/.qmake.conf b/.qmake.conf
new file mode 100644
index 0000000..f5a422c
--- /dev/null
+++ b/.qmake.conf
@@ -0,0 +1,3 @@
+load(qt_build_config)
+
+MODULE_VERSION = 5.1.0
diff --git a/examples/embeddedqwindow/embeddedqwindow.pro b/examples/embeddedqwindow/embeddedqwindow.pro
index 99c1ed2..022a614 100644
--- a/examples/embeddedqwindow/embeddedqwindow.pro
+++ b/examples/embeddedqwindow/embeddedqwindow.pro
@@ -5,5 +5,5 @@ HEADERS += window.h
 SOURCES += window.cpp
 LIBS += -framework Cocoa
 
-QT += gui widgets 
+QT += gui widgets macextras
 QT += widgets-private gui-private core-private
diff --git a/examples/macfunctions/macfunctions.pro b/examples/macfunctions/macfunctions.pro
index 4c86a7f..8d11880 100644
--- a/examples/macfunctions/macfunctions.pro
+++ b/examples/macfunctions/macfunctions.pro
@@ -2,9 +2,7 @@ TEMPLATE = app
 TARGET = macfunctions
 DEPENDPATH += .
 INCLUDEPATH += .
-QT += widgets
-
-include (../../src/qtmacextras.pri)
+QT += widgets macextras
 
 # Input
 SOURCES += main.cpp
diff --git a/examples/macpasteboardmime/macpasteboardmime.pro b/examples/macpasteboardmime/macpasteboardmime.pro
index f2bcd2e..9869637 100644
--- a/examples/macpasteboardmime/macpasteboardmime.pro
+++ b/examples/macpasteboardmime/macpasteboardmime.pro
@@ -1,4 +1,4 @@
-include (../../src/qtmacextras.pri)
+QT += macextras
 
 SOURCES += main.cpp
 
diff --git a/examples/macunifiedtoolbar/macunifiedtoolbar.pro b/examples/macunifiedtoolbar/macunifiedtoolbar.pro
index 99101c4..c13f714 100644
--- a/examples/macunifiedtoolbar/macunifiedtoolbar.pro
+++ b/examples/macunifiedtoolbar/macunifiedtoolbar.pro
@@ -1,6 +1,4 @@
-include (../../src/qtmacextras.pri)
-
-QT += core gui
+QT += core gui macextras
 greaterThan(QT_MAJOR_VERSION, 4):QT += widgets
 
 SOURCES += \
diff --git a/examples/qtmacnativewidget/qtmacnativewidget.pro b/examples/qtmacnativewidget/qtmacnativewidget.pro
index 84726f1..df5f825 100644
--- a/examples/qtmacnativewidget/qtmacnativewidget.pro
+++ b/examples/qtmacnativewidget/qtmacnativewidget.pro
@@ -1,9 +1,7 @@
 TEMPLATE = app
 
-include (../../src/qtmacextras.pri)
-
 OBJECTIVE_SOURCES += main.mm
 LIBS += -framework Cocoa
 
-QT += gui widgets
+QT += gui widgets macextras
 QT += widgets-private gui-private core-private
diff --git a/qtmacextras.pro b/qtmacextras.pro
new file mode 100644
index 0000000..58c33f2
--- /dev/null
+++ b/qtmacextras.pro
@@ -0,0 +1 @@
+load(qt_parts)
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
new file mode 100644
index 0000000..87fcf91
--- /dev/null
+++ b/src/macextras/macextras-lib.pri
@@ -0,0 +1,32 @@
+INCLUDEPATH += $$PWD
+
+PUBLIC_HEADERS += \
+    $$PWD/qtmacfunctions.h \
+    $$PWD/qtmacnativewidget.h \
+    $$PWD/qtmactoolbutton.h \
+    $$PWD/qtmacunifiedtoolbar.h
+
+HEADERS += \
+    $$PWD/qtmactoolbardelegate.h \
+    $$PWD/qtnstoolbar.h
+
+macx:!ios {
+    OBJECTIVE_SOURCES += \
+        $$PWD/qtmacfunctions.mm \
+        $$PWD/qtmacnativewidget.mm \
+        $$PWD/qtmactoolbardelegate.mm \
+        $$PWD/qtmactoolbutton.mm \
+        $$PWD/qtmacunifiedtoolbar.mm \
+        $$PWD/qtnstoolbar.mm
+
+    LIBS *= -framework AppKit
+} else {
+    SOURCES += $$PWD/qtmacunifiedtoolbar.cpp
+}
+
+macx:!ios:greaterThan(QT_MAJOR_VERSION, 4) {
+    HEADERS += $$PWD/qmacpasteboardmime.h
+    OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
+}
+
+HEADERS += $$PUBLIC_HEADERS
diff --git a/src/macextras/macextras.pro b/src/macextras/macextras.pro
new file mode 100644
index 0000000..cc55456
--- /dev/null
+++ b/src/macextras/macextras.pro
@@ -0,0 +1,6 @@
+include($$PWD/macextras-lib.pri)
+
+load(qt_build_config)
+QT += widgets gui-private
+TARGET = QtMacExtras
+load(qt_module)
diff --git a/src/qmacpasteboardmime.h b/src/macextras/qmacpasteboardmime.h
index 8570ea9..8570ea9 100644
--- a/src/qmacpasteboardmime.h
+++ b/src/macextras/qmacpasteboardmime.h
diff --git a/src/qmacpasteboardmime.mm b/src/macextras/qmacpasteboardmime.mm
index 3137b67..3137b67 100644
--- a/src/qmacpasteboardmime.mm
+++ b/src/macextras/qmacpasteboardmime.mm
diff --git a/src/qtmacfunctions.h b/src/macextras/qtmacfunctions.h
index 9e9edc4..9e9edc4 100644
--- a/src/qtmacfunctions.h
+++ b/src/macextras/qtmacfunctions.h
diff --git a/src/qtmacfunctions.mm b/src/macextras/qtmacfunctions.mm
index 7db6789..7db6789 100644
--- a/src/qtmacfunctions.mm
+++ b/src/macextras/qtmacfunctions.mm
diff --git a/src/qtmacnativewidget.h b/src/macextras/qtmacnativewidget.h
index 44e80e7..44e80e7 100644
--- a/src/qtmacnativewidget.h
+++ b/src/macextras/qtmacnativewidget.h
diff --git a/src/qtmacnativewidget.mm b/src/macextras/qtmacnativewidget.mm
index 06a0ff2..06a0ff2 100644
--- a/src/qtmacnativewidget.mm
+++ b/src/macextras/qtmacnativewidget.mm
diff --git a/src/qtmactoolbardelegate.h b/src/macextras/qtmactoolbardelegate.h
index 6e0a5b5..6e0a5b5 100644
--- a/src/qtmactoolbardelegate.h
+++ b/src/macextras/qtmactoolbardelegate.h
diff --git a/src/qtmactoolbardelegate.mm b/src/macextras/qtmactoolbardelegate.mm
index ec2f063..ec2f063 100644
--- a/src/qtmactoolbardelegate.mm
+++ b/src/macextras/qtmactoolbardelegate.mm
diff --git a/src/qtmactoolbutton.h b/src/macextras/qtmactoolbutton.h
index 0efefe1..0efefe1 100644
--- a/src/qtmactoolbutton.h
+++ b/src/macextras/qtmactoolbutton.h
diff --git a/src/qtmactoolbutton.mm b/src/macextras/qtmactoolbutton.mm
index 86eec2a..86eec2a 100644
--- a/src/qtmactoolbutton.mm
+++ b/src/macextras/qtmactoolbutton.mm
diff --git a/src/qtmacunifiedtoolbar.cpp b/src/macextras/qtmacunifiedtoolbar.cpp
index 0ac488f..0ac488f 100644
--- a/src/qtmacunifiedtoolbar.cpp
+++ b/src/macextras/qtmacunifiedtoolbar.cpp
diff --git a/src/qtmacunifiedtoolbar.h b/src/macextras/qtmacunifiedtoolbar.h
index 5bcc667..5bcc667 100644
--- a/src/qtmacunifiedtoolbar.h
+++ b/src/macextras/qtmacunifiedtoolbar.h
diff --git a/src/qtmacunifiedtoolbar.mm b/src/macextras/qtmacunifiedtoolbar.mm
index 8f4056f..8f4056f 100644
--- a/src/qtmacunifiedtoolbar.mm
+++ b/src/macextras/qtmacunifiedtoolbar.mm
diff --git a/src/qtnstoolbar.h b/src/macextras/qtnstoolbar.h
index 3bf3f10..3bf3f10 100644
--- a/src/qtnstoolbar.h
+++ b/src/macextras/qtnstoolbar.h
diff --git a/src/qtnstoolbar.mm b/src/macextras/qtnstoolbar.mm
index 15c45e4..15c45e4 100644
--- a/src/qtnstoolbar.mm
+++ b/src/macextras/qtnstoolbar.mm
diff --git a/src/qtmacextras.pri b/src/qtmacextras.pri
deleted file mode 100644
index f4f233b..0000000
--- a/src/qtmacextras.pri
+++ /dev/null
@@ -1,61 +0,0 @@
-QT += widgets gui-private
-INCLUDEPATH += $$PWD
-DEPENDPATH += $$PWD
-
-OBJECTS_DIR = .obj
-MOC_DIR = .moc
-
-# minQtVersion from qtcreator.pri
-defineTest(minQtVersion) {
-    maj = $$1
-    min = $$2
-    patch = $$3
-    isEqual(QT_MAJOR_VERSION, $$maj) {
-        isEqual(QT_MINOR_VERSION, $$min) {
-            isEqual(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-            greaterThan(QT_PATCH_VERSION, $$patch) {
-                return(true)
-            }
-        }
-        greaterThan(QT_MINOR_VERSION, $$min) {
-            return(true)
-        }
-    }
-    greaterThan(QT_MAJOR_VERSION, $$maj) {
-        return(true)
-    }
-    return(false)
-}
-
-# QtMacUnifiedToolBar
-HEADERS += $$PWD/qtmacunifiedtoolbar.h  \
-           $$PWD/qtmactoolbardelegate.h \
-           $$PWD/qtmactoolbutton.h \
-           $$PWD/qtnstoolbar.h
-
-mac {
-    OBJECTIVE_SOURCES += $$PWD/qtmacunifiedtoolbar.mm \
-                         $$PWD/qtmactoolbardelegate.mm \
-                         $$PWD/qtmactoolbutton.mm \
-                         $$PWD/qtnstoolbar.mm
-
-    LIBS *= -framework AppKit
-} else {
-    SOURCES += $$PWD/qtmacunifiedtoolbar.cpp
-}
-
-# QtMacPasteboardMime
-mac:minQtVersion(5, 0, 0) {
-    HEADERS += $$PWD/qmacpasteboardmime.h
-    OBJECTIVE_SOURCES += $$PWD/qmacpasteboardmime.mm
-}
-
-# qt_mac_set_dock_menu
-HEADERS += $$PWD/qtmacfunctions.h
-OBJECTIVE_SOURCES += $$PWD/qtmacfunctions.mm
-
-# QtMacNativeWidget
-HEADERS += $$PWD/qtmacnativewidget.h
-OBJECTIVE_SOURCES += $$PWD/qtmacnativewidget.mm
diff --git a/src/src.pro b/src/src.pro
new file mode 100644
index 0000000..89e9950
--- /dev/null
+++ b/src/src.pro
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+macx:!ios:SUBDIRS += macextras
diff --git a/sync.profile b/sync.profile
new file mode 100644
index 0000000..4a7e46b
--- /dev/null
+++ b/sync.profile
@@ -0,0 +1,7 @@
+%modules = (
+    "QtMacExtras" => "$basedir/src/macextras",
+);
+
+%dependencies = (
+    "qtbase" => "refs/heads/stable",
+);
diff --git a/tests/auto/macfunctions/macfunctions.pro b/tests/auto/macfunctions/macfunctions.pro
index c34a9ed..eee725f 100644
--- a/tests/auto/macfunctions/macfunctions.pro
+++ b/tests/auto/macfunctions/macfunctions.pro
@@ -1,12 +1,6 @@
-QT       += testlib
-
+CONFIG += testcase console
+CONFIG -= app_bundle
 TARGET = tst_qtmacfunctions
-CONFIG   += console
-CONFIG   -= app_bundle
-
-TEMPLATE = app
-
-include (../../../src/qtmacextras.pri)
-
-OBJECTIVE_SOURCES += $$PWD/tst_qtmacfunctions.mm
+QT += macextras widgets testlib
+OBJECTIVE_SOURCES += tst_qtmacfunctions.mm
 LIBS *= -framework AppKit
diff --git a/tests/tests.pro b/tests/tests.pro
index 7fbc8a9..77383dc 100644
--- a/tests/tests.pro
+++ b/tests/tests.pro
@@ -1,2 +1,2 @@
 TEMPLATE = subdirs
-SUBDIRS = auto
+macx:!ios:SUBDIRS = auto