Remove usage of PRIVATE_ and PUBLIC_HEADERS

pro2cmake does not like them

Change-Id: I2fafdfff587fe76076417a53a082e467274db728
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>

4 files changed, 22 insertions, 30 deletions

diff --git a/src/bluetooth/android/android.pri b/src/bluetooth/android/android.pri
index c50a919a..af39a6d7 100644
--- a/src/bluetooth/android/android.pri
+++ b/src/bluetooth/android/android.pri
@@ -1,4 +1,4 @@
-PRIVATE_HEADERS +=  \
+HEADERS +=  \
         android/inputstreamthread_p.h \
         android/devicediscoverybroadcastreceiver_p.h \
         android/servicediscoverybroadcastreceiver_p.h \
diff --git a/src/bluetooth/bluetooth.pro b/src/bluetooth/bluetooth.pro
index 51b12b5f..f09564cd 100644
--- a/src/bluetooth/bluetooth.pro
+++ b/src/bluetooth/bluetooth.pro
@@ -5,7 +5,7 @@ DEFINES += QT_NO_FOREACH
 QMAKE_DOCS = $$PWD/doc/qtbluetooth.qdocconf
 OTHER_FILES += doc/src/*.qdoc   # show .qdoc files in Qt Creator
 
-PUBLIC_HEADERS += \
+HEADERS += \
     qtbluetoothglobal.h \
     qbluetoothaddress.h\
     qbluetoothhostinfo.h \
@@ -30,9 +30,7 @@ PUBLIC_HEADERS += \
     qlowenergyadvertisingdata.h \
     qlowenergyadvertisingparameters.h \
     qlowenergyconnectionparameters.h \
-    qlowenergycontroller.h
-
-PRIVATE_HEADERS += \
+    qlowenergycontroller.h \
     qtbluetoothglobal_p.h \
     qbluetoothaddress_p.h\
     qbluetoothhostinfo_p.h \
@@ -94,7 +92,7 @@ qtConfig(bluez) {
 
     include(bluez/bluez.pri)
 
-    PRIVATE_HEADERS += \
+    HEADERS += \
         qbluetoothtransferreply_bluez_p.h \
         qbluetoothsocket_bluez_p.h \
         qbluetoothsocket_bluezdbus_p.h
@@ -118,7 +116,7 @@ qtConfig(bluez) {
             lecmaccalculator.cpp \
             qlowenergycontroller_bluezdbus.cpp
 
-        PRIVATE_HEADERS += qlowenergycontroller_bluezdbus_p.h \
+        HEADERS += qlowenergycontroller_bluezdbus_p.h \
                            qlowenergycontroller_bluez_p.h
 
         qtConfig(linux_crypto_api): DEFINES += CONFIG_LINUX_CRYPTO_API
@@ -128,7 +126,7 @@ qtConfig(bluez) {
         SOURCES += \
             qlowenergycontroller_dummy.cpp
 
-        PRIVATE_HEADERS += qlowenergycontroller_dummy_p.h
+        HEADERS += qlowenergycontroller_dummy_p.h
     }
 
 } else:android:!android-embedded {
@@ -152,7 +150,7 @@ qtConfig(bluez) {
         qbluetoothserver_android.cpp \
         qlowenergycontroller_android.cpp
 
-    PRIVATE_HEADERS += qlowenergycontroller_android_p.h \
+    HEADERS += qlowenergycontroller_android_p.h \
                        qbluetoothsocket_android_p.h
 } else:osx {
     QT_PRIVATE = concurrent
@@ -170,7 +168,7 @@ qtConfig(bluez) {
         qbluetoothtransferreply_osx.mm \
         qlowenergycontroller_darwin.mm
 
-    PRIVATE_HEADERS += qbluetoothsocket_osx_p.h \
+    HEADERS += qbluetoothsocket_osx_p.h \
                        qbluetoothtransferreply_osx_p.h \
                        qlowenergycontroller_darwin_p.h
 } else:ios|tvos {
@@ -181,7 +179,7 @@ qtConfig(bluez) {
         qbluetoothdevicediscoveryagent_darwin.mm \
         qlowenergycontroller_darwin.mm
 
-    PRIVATE_HEADERS += \
+    HEADERS += \
         qlowenergycontroller_darwin_p.h \
         qbluetoothsocket_dummy_p.h
 
@@ -212,13 +210,13 @@ qtConfig(bluez) {
         qbluetoothutils_winrt.cpp \
         qlowenergycontroller_winrt.cpp
 
-    PRIVATE_HEADERS += qlowenergycontroller_winrt_p.h \
+    HEADERS += qlowenergycontroller_winrt_p.h \
                        qbluetoothsocket_winrt_p.h \
                        qbluetoothutils_winrt_p.h
 
     qtConfig(winrt_btle_no_pairing) {
         SOURCES += qlowenergycontroller_winrt_new.cpp
-        PRIVATE_HEADERS += qlowenergycontroller_winrt_new_p.h
+        HEADERS += qlowenergycontroller_winrt_new_p.h
     }
 
     lessThan(WINDOWS_SDK_VERSION, 14393) {
@@ -241,7 +239,7 @@ qtConfig(bluez) {
         qbluetoothserver_win.cpp \
         qlowenergycontroller_win.cpp
 
-    PRIVATE_HEADERS += qlowenergycontroller_win_p.h \
+    HEADERS += qlowenergycontroller_win_p.h \
                        qbluetoothsocket_win_p.h
 } else {
     message("Unsupported Bluetooth platform, will not build a working QtBluetooth library.")
@@ -256,7 +254,7 @@ qtConfig(bluez) {
         qbluetoothserver_p.cpp \
         qlowenergycontroller_dummy.cpp
 
-    PRIVATE_HEADERS += qlowenergycontroller_dummy_p.h \
+    HEADERS += qlowenergycontroller_dummy_p.h \
                        qbluetoothsocket_dummy_p.h
 }
 
@@ -268,6 +266,4 @@ winrt {
 
 OTHER_FILES +=
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
 load(qt_module)
diff --git a/src/bluetooth/osx/osxbt.pri b/src/bluetooth/osx/osxbt.pri
index 8f6ea0d1..edc1c751 100644
--- a/src/bluetooth/osx/osxbt.pri
+++ b/src/bluetooth/osx/osxbt.pri
@@ -2,7 +2,7 @@ SOURCES += osx/uistrings.cpp \
            osx/osxbtnotifier.cpp \
            osx/btdelegates.cpp
 
-PRIVATE_HEADERS += osx/uistrings_p.h \
+HEADERS += osx/uistrings_p.h \
                    osx/osxbtgcdtimer_p.h \
                    osx/btraii_p.h \
                    osx/btdelegates_p.h
@@ -13,7 +13,7 @@ OBJECTIVE_SOURCES += osx/osxbtgcdtimer.mm \
 #QMAKE_CXXFLAGS_WARN_ON += -Wno-nullability-completeness
 
 CONFIG(osx) {
-    PRIVATE_HEADERS += osx/osxbtutility_p.h \
+    HEADERS += osx/osxbtutility_p.h \
                        osx/osxbtdevicepair_p.h \
                        osx/osxbtdeviceinquiry_p.h \
                        osx/osxbtconnectionmonitor_p.h \
@@ -43,13 +43,13 @@ CONFIG(osx) {
                          osx/osxbtcentralmanager.mm \
                          osx/osxbtperipheralmanager.mm
 } else {
-    PRIVATE_HEADERS += osx/osxbtutility_p.h \
+    HEADERS += osx/osxbtutility_p.h \
                        osx/osxbtledeviceinquiry_p.h \
                        osx/osxbluetooth_p.h \
                        osx/osxbtcentralmanager_p.h \
                        osx/osxbtnotifier_p.h
     ios {
-        PRIVATE_HEADERS += osx/osxbtperipheralmanager_p.h
+        HEADERS += osx/osxbtperipheralmanager_p.h
     }
 
     OBJECTIVE_SOURCES += osx/osxbtutility.mm \
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro
index ed88b79a..c6ae147d 100644
--- a/src/nfc/nfc.pro
+++ b/src/nfc/nfc.pro
@@ -5,7 +5,7 @@ DEFINES += QT_NO_FOREACH
 QMAKE_DOCS = $$PWD/doc/qtnfc.qdocconf
 OTHER_FILES += doc/src/*.qdoc   # show .qdoc files in Qt Creator
 
-PUBLIC_HEADERS += \
+HEADERS += \
     qtnfcglobal.h \
     qnearfieldmanager.h \
     qnearfieldtarget.h \
@@ -17,9 +17,7 @@ PUBLIC_HEADERS += \
     qqmlndefrecord.h \
     qndefnfcsmartposterrecord.h \
     qnearfieldsharemanager.h \
-    qnearfieldsharetarget.h
-
-PRIVATE_HEADERS += \
+    qnearfieldsharetarget.h \
     qtnfcglobal_p.h \
     qllcpsocket_p.h \
     qllcpserver_p.h \
@@ -63,7 +61,7 @@ linux:!android:qtHaveModule(dbus) {
 
     DEFINES += NEARD_NFC
 
-    PRIVATE_HEADERS += \
+    HEADERS += \
         qllcpsocket_p_p.h \
         qllcpserver_p_p.h \
         qnearfieldmanager_neard_p.h \
@@ -91,7 +89,7 @@ linux:!android:qtHaveModule(dbus) {
     DEFINES += ANDROID_NFC
     QT_PRIVATE += core-private gui androidextras
 
-    PRIVATE_HEADERS += \
+    HEADERS += \
         qllcpserver_android_p.h \
         qllcpsocket_android_p.h \
         android/androidjninfc_p.h \
@@ -117,7 +115,7 @@ linux:!android:qtHaveModule(dbus) {
 isEmpty(NFC_BACKEND_AVAILABLE) {
     message("Unsupported NFC platform, will not build a working QtNfc library.")
 
-    PRIVATE_HEADERS += \
+    HEADERS += \
         qllcpsocket_p_p.h \
         qllcpserver_p_p.h \
         qnearfieldmanagerimpl_p.h \
@@ -133,6 +131,4 @@ isEmpty(NFC_BACKEND_AVAILABLE) {
         qnearfieldtarget_p.cpp
 }
 
-HEADERS += $$PUBLIC_HEADERS $$PRIVATE_HEADERS
-
 load(qt_module)