aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJake Petroules <jake.petroules@petroules.com>2013-09-04 08:18:01 -0400
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-09-04 14:42:13 +0200
commit7b6e8623056840155b7d5530b161ed93f7b14aa0 (patch)
tree0226594dcbc9e1bfed911f2dabcf0c7927924baa /src
parentfc383361488ce507ebb113f9deaa745b2752f1dd (diff)
Privatise private headers and modules.
Change-Id: Iaad9cdc897ba19acfdbfc136e4baf959cabc3f70 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/macextras/macextras-lib.pri4
-rw-r--r--src/macextras/macextras.pro3
-rw-r--r--src/macextras/qmacnativetoolbar.mm4
-rw-r--r--src/macextras/qmactoolbardelegate.mm2
-rw-r--r--src/macextras/qmactoolbardelegate_p.h (renamed from src/macextras/qmactoolbardelegate.h)0
-rw-r--r--src/macextras/qnstoolbar.mm2
-rw-r--r--src/macextras/qnstoolbar_p.h (renamed from src/macextras/qnstoolbar.h)0
7 files changed, 8 insertions, 7 deletions
diff --git a/src/macextras/macextras-lib.pri b/src/macextras/macextras-lib.pri
index 4a5dd94..245c4c5 100644
--- a/src/macextras/macextras-lib.pri
+++ b/src/macextras/macextras-lib.pri
@@ -18,8 +18,8 @@ mac {
$$PWD/qmactoolbutton.h
PRIVATE_HEADERS += \
- $$PWD/qmactoolbardelegate.h \
- $$PWD/qnstoolbar.h
+ $$PWD/qmactoolbardelegate_p.h \
+ $$PWD/qnstoolbar_p.h
OBJECTIVE_SOURCES += \
$$PWD/qmaccocoaviewcontainer.mm \
diff --git a/src/macextras/macextras.pro b/src/macextras/macextras.pro
index fb39293..221dbdd 100644
--- a/src/macextras/macextras.pro
+++ b/src/macextras/macextras.pro
@@ -1,6 +1,7 @@
include($$PWD/macextras-lib.pri)
load(qt_build_config)
-QT += widgets gui-private core-private
+QT += widgets
+QT_PRIVATE += gui-private core-private
TARGET = QtMacExtras
load(qt_module)
diff --git a/src/macextras/qmacnativetoolbar.mm b/src/macextras/qmacnativetoolbar.mm
index e7d9fb3..69fe7fe 100644
--- a/src/macextras/qmacnativetoolbar.mm
+++ b/src/macextras/qmacnativetoolbar.mm
@@ -42,8 +42,8 @@
#import <AppKit/AppKit.h>
#include "qmacfunctions.h"
#include "qmacnativetoolbar.h"
-#include "qmactoolbardelegate.h"
-#include "qnstoolbar.h"
+#include "qmactoolbardelegate_p.h"
+#include "qnstoolbar_p.h"
#include <QAction>
#include <QApplication>
#include <QDebug>
diff --git a/src/macextras/qmactoolbardelegate.mm b/src/macextras/qmactoolbardelegate.mm
index 6620946..43fcfe8 100644
--- a/src/macextras/qmactoolbardelegate.mm
+++ b/src/macextras/qmactoolbardelegate.mm
@@ -40,7 +40,7 @@
****************************************************************************/
#include "qmacfunctions.h"
-#include "qmactoolbardelegate.h"
+#include "qmactoolbardelegate_p.h"
#include <QAction>
#include <QImage>
#include <QPixmap>
diff --git a/src/macextras/qmactoolbardelegate.h b/src/macextras/qmactoolbardelegate_p.h
index b40a6ed..b40a6ed 100644
--- a/src/macextras/qmactoolbardelegate.h
+++ b/src/macextras/qmactoolbardelegate_p.h
diff --git a/src/macextras/qnstoolbar.mm b/src/macextras/qnstoolbar.mm
index d50ea2a..d80445d 100644
--- a/src/macextras/qnstoolbar.mm
+++ b/src/macextras/qnstoolbar.mm
@@ -39,7 +39,7 @@
**
****************************************************************************/
-#import "qnstoolbar.h"
+#import "qnstoolbar_p.h"
NSString *QtNSToolbarDisplayModeChangedNotification = @"QtNSToolbarDisplayModeChangedNotification";
NSString *QtNSToolbarShowsBaselineSeparatorChangedNotification = @"QtNSToolbarShowsBaselineSeparatorChangedNotification";
diff --git a/src/macextras/qnstoolbar.h b/src/macextras/qnstoolbar_p.h
index 9a0d784..9a0d784 100644
--- a/src/macextras/qnstoolbar.h
+++ b/src/macextras/qnstoolbar_p.h