Merge lp:~sergiusens/phablet-extras/qtmultimedia-opensource-src-touch-5.2 into lp:~phablet-team/phablet-extras/qtmultimedia-touch

[Sergio Schvezov]

* Updating for 5.2 migration:
  - Depending on qt >= 5.2.1 for the ABI change
  - Updating symbols (qreal in armhf)
  - Adjusting diverts for 5.2.
  - Fixing pri files to adapt to new paths
* Fixing qtdeclarative control file
* Updating standards to 3.9.5
* Adding syncqt.pl from qtbase-opensource-src to sync headers and using in
  during configure.

Don't push or merge until Qt 5.2 is ready

[Timo Jyrinki (timo-jyrinki)]

Functional testing shows this works great:
- Audio and video playback possible on device
- Installation on top of earlier Qt 5.2 upgraded device works
- Dist-upgrade from 5.0.2 continues to work, while now the qtmultimedia-touch packages don't need removal

Awesome!

review: Approve

[Timo Jyrinki (timo-jyrinki)]

Uploaded to the landing PPA: https://launchpad.net/~ci-train-ppa-service/+archive/landing-006/+packages

Unmerged revisions

93. By Sergio Schvezov on 2014-02-26

* Updating for 5.2 migration:
  - Depending on qt >= 5.2.1 for the ABI change
  - Updating symbols (qreal in armhf)
  - Adjusting diverts for 5.2.
  - Fixing pri files to adapt to new paths
* Fixing qtdeclarative control file
* Updating standards to 3.9.5
* Adding syncqt.pl from qtbase-opensource-src to sync headers and using in
  during configure.

=== modified file 'debian/changelog'
--- debian/changelog	2014-02-06 21:08:43 +0000
+++ debian/changelog	2014-02-26 20:49:23 +0000
@@ -1,3 +1,17 @@
+qtmultimedia-opensource-src-touch (5.1.1+git20131205+8230c02-0ubuntu4) UNRELEASED; urgency=medium
+
+  * Updating for 5.2 migration:
+    - Depending on qt >= 5.2.1 for the ABI change
+    - Updating symbols (qreal in armhf) 
+    - Adjusting diverts for 5.2.
+    - Fixing pri files to adapt to new paths 
+  * Fixing qtdeclarative control file 
+  * Updating standards to 3.9.5
+  * Adding syncqt.pl from qtbase-opensource-src to sync headers and using in
+    during configure. 
+
+ -- Sergio Schvezov <[e-mail]>  Wed, 26 Feb 2014 17:42:55 -0300
+
 qtmultimedia-opensource-src-touch (5.1.1+git20131205+8230c02-0ubuntu3) trusty; urgency=medium
 
   * Fixing symbols table for libqgsttools-p1-touch.

=== modified file 'debian/control'
--- debian/control	2013-10-02 23:44:09 +0000
+++ debian/control	2014-02-26 20:49:23 +0000
@@ -10,10 +10,10 @@
            Lisandro Damián Nicanor Pérez Meyer <[e-mail]>,
            Timo Jyrinki <[e-mail]>
 Build-Depends: debhelper (>= 9.0.0),
-               qtbase5-dev (>= 5.0.2+dfsg1-6~),
-               libqt5opengl5-dev (>= 5.0.2~),
-               qtbase5-private-dev (>= 5.0.2~),
-               qtdeclarative5-private-dev (>= 5.0.2~),
+               qtbase5-dev (>= 5.2.1+dfsg~),
+               libqt5opengl5-dev (>= 5.2.1+dfsg~),
+               qtbase5-private-dev (>= 5.2.1+dfsg~),
+               qtdeclarative5-private-dev (>= 5.2.1~),
                libasound2-dev [linux-any],
                libpulse-dev,
                libgstreamer-plugins-base1.0-dev,
@@ -22,8 +22,8 @@
                zlib1g-dev,
                pkg-kde-tools,
 Build-Depends-Indep: libqt5sql5-sqlite,
-                     qttools5-dev-tools (>= 5.0.2~)
-Standards-Version: 3.9.4
+                     qttools5-dev-tools (>= 5.2.1~)
+Standards-Version: 3.9.5
 Homepage: https://qt-project.org/
 Vcs-Git: git://github.com/jhodapp/qtmultimedia.git
 Vcs-Browser: https://github.com/jhodapp/qtmultimedia
@@ -148,21 +148,6 @@
  This package contains the development files needed to build Qt applications
  using Qt Multimedia libraries.
 
-Package: qtmultimedia5-touch-private-dev
-Architecture: any
-Section: libdevel
-Pre-Depends: dpkg (>= 1.15.6~)
-Depends: qtmultimedia5-touch-dev (= ${binary:Version}), ${misc:Depends}
-Conflicts: qtmultimedia5-private-dev
-Description: APIs for multimedia functionality - private development files
- Qt is a cross-platform C++ application framework. Qt's primary feature
- is its rich set of widgets that provide standard GUI functionality.
- .
- This package contains the private header development files for building some
- Qt 5 applications like Qt Creator QML Designer plugin.
- .
- Use at your own risk.
-
 Package: qtmultimedia5-touch-dbg
 Architecture: any
 Multi-Arch: same
@@ -177,3 +162,20 @@
  .
  This package contains the debugging symbols for the Qt 5 Multimedia
  libraries.
+
+Package: qtmultimedia5-touch-private-dev
+Architecture: any
+Section: libdevel
+Pre-Depends: dpkg (>= 1.15.6~)
+Depends: qtmultimedia5-touch-dev (= ${binary:Version}), ${misc:Depends}
+Conflicts: qtmultimedia5-private-dev
+Description: APIs for multimedia functionality - private development files
+ Qt is a cross-platform C++ application framework. Qt's primary feature
+ is its rich set of widgets that provide standard GUI functionality.
+ .
+ This package contains the private header development files for building some
+ Qt 5 applications like Qt Creator QML Designer plugin.
+ .
+ Use at your own risk.
+
+

=== modified file 'debian/libqt5multimedia5-touch.postrm'
--- debian/libqt5multimedia5-touch.postrm	2013-09-20 20:15:35 +0000
+++ debian/libqt5multimedia5-touch.postrm	2014-02-26 20:49:23 +0000
@@ -2,7 +2,7 @@
 divert_dir="/var/lib/$pkg-diverted"
 
 if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" -o purge = "$1" ]; then
-  for version in  5.0.2 5.0 5; do
+  for version in  5.2.1 5.2 5; do
     dpkg-divert --package "$pkg" --remove --rename \
       --divert \
       "$divert_dir"/libQt5Multimedia.so.$version.diverted-$pkg \

=== modified file 'debian/libqt5multimedia5-touch.preinst'
--- debian/libqt5multimedia5-touch.preinst	2013-09-20 20:15:35 +0000
+++ debian/libqt5multimedia5-touch.preinst	2014-02-26 20:49:23 +0000
@@ -6,7 +6,7 @@
     mkdir -p "$divert_dir"
   fi
 
-  for version in 5.0.2 5.0 5; do
+  for version in 5.2.1 5.2 5; do
     dpkg-divert --package "$pkg" --add --rename \
       --divert \
       "$divert_dir"/libQt5Multimedia.so.$version.diverted-$pkg \

=== modified file 'debian/libqt5multimedia5-touch.symbols'
--- debian/libqt5multimedia5-touch.symbols	2013-09-20 08:12:11 +0000
+++ debian/libqt5multimedia5-touch.symbols	2014-02-26 20:49:23 +0000
@@ -30,7 +30,8 @@
  _ZN11QAudioInput6notifyEv@Base 5.0.2
  _ZN11QAudioInput6resumeEv@Base 5.0.2
  _ZN11QAudioInput7suspendEv@Base 5.0.2
- (subst)_ZN11QAudioInput9setVolumeE{qreal}@Base 5.0.2
+ _ZN11QAudioInput9setVolumeEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN11QAudioInput9setVolumeE{qreal}@Base 5.0.2
  _ZN11QAudioInputC1ERK12QAudioFormatP7QObject@Base 5.0.2
  _ZN11QAudioInputC1ERK16QAudioDeviceInfoRK12QAudioFormatP7QObject@Base 5.0.2
  _ZN11QAudioInputC2ERK12QAudioFormatP7QObject@Base 5.0.2
@@ -155,7 +156,8 @@
  _ZN12QAudioOutput6notifyEv@Base 5.0.2
  _ZN12QAudioOutput6resumeEv@Base 5.0.2
  _ZN12QAudioOutput7suspendEv@Base 5.0.2
- (subst)_ZN12QAudioOutput9setVolumeE{qreal}@Base 5.0.2
+ _ZN12QAudioOutput9setVolumeEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QAudioOutput9setVolumeE{qreal}@Base 5.0.2
  _ZN12QAudioOutputC1ERK12QAudioFormatP7QObject@Base 5.0.2
  _ZN12QAudioOutputC1ERK16QAudioDeviceInfoRK12QAudioFormatP7QObject@Base 5.0.2
  _ZN12QAudioOutputC2ERK12QAudioFormatP7QObject@Base 5.0.2
@@ -169,12 +171,17 @@
  _ZN12QCameraFocus16staticMetaObjectE@Base 5.0.2
  _ZN12QCameraFocus17focusZonesChangedEv@Base 5.0.2
  _ZN12QCameraFocus17setFocusPointModeENS_14FocusPointModeE@Base 5.0.2
- (subst)_ZN12QCameraFocus18digitalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN12QCameraFocus18opticalZoomChangedE{qreal}@Base 5.0.2
+ _ZN12QCameraFocus18digitalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QCameraFocus18digitalZoomChangedE{qreal}@Base 5.0.2
+ _ZN12QCameraFocus18opticalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QCameraFocus18opticalZoomChangedE{qreal}@Base 5.0.2
  _ZN12QCameraFocus19setCustomFocusPointERK7QPointF@Base 5.0.2
- (subst)_ZN12QCameraFocus25maximumDigitalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN12QCameraFocus25maximumOpticalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN12QCameraFocus6zoomToE{qreal}{qreal}@Base 5.0.2
+ _ZN12QCameraFocus25maximumDigitalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QCameraFocus25maximumDigitalZoomChangedE{qreal}@Base 5.0.2
+ _ZN12QCameraFocus25maximumOpticalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QCameraFocus25maximumOpticalZoomChangedE{qreal}@Base 5.0.2
+ _ZN12QCameraFocus6zoomToEdd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QCameraFocus6zoomToE{qreal}{qreal}@Base 5.0.2
  _ZN12QCameraFocusC1EP7QCamera@Base 5.0.2
  _ZN12QCameraFocusC2EP7QCamera@Base 5.0.2
  _ZN12QCameraFocusD0Ev@Base 5.0.2
@@ -217,13 +224,15 @@
  _ZN12QMediaPlayer15durationChangedEx@Base 5.0.2
  _ZN12QMediaPlayer15positionChangedEx@Base 5.0.2
  _ZN12QMediaPlayer15seekableChangedEb@Base 5.0.2
- (subst)_ZN12QMediaPlayer15setPlaybackRateE{qreal}@Base 5.0.2
+ _ZN12QMediaPlayer15setPlaybackRateEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QMediaPlayer15setPlaybackRateE{qreal}@Base 5.0.2
  _ZN12QMediaPlayer16staticMetaObjectE@Base 5.0.2
  _ZN12QMediaPlayer18mediaStatusChangedENS_11MediaStatusE@Base 5.0.2
  _ZN12QMediaPlayer18supportedMimeTypesE6QFlagsINS_4FlagEE@Base 5.0.2
  _ZN12QMediaPlayer19bufferStatusChangedEi@Base 5.0.2
  _ZN12QMediaPlayer19currentMediaChangedERK13QMediaContent@Base 5.0.2
- (subst)_ZN12QMediaPlayer19playbackRateChangedE{qreal}@Base 5.0.2
+ _ZN12QMediaPlayer19playbackRateChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QMediaPlayer19playbackRateChangedE{qreal}@Base 5.0.2
  _ZN12QMediaPlayer21audioAvailableChangedEb@Base 5.0.2
  _ZN12QMediaPlayer21videoAvailableChangedEb@Base 5.0.2
  _ZN12QMediaPlayer24setNetworkConfigurationsERK5QListI21QNetworkConfigurationE@Base 5.0.2
@@ -278,7 +287,8 @@
  _ZN12QSoundEffect4stopEv@Base 5.0.2
  _ZN12QSoundEffect8setMutedEb@Base 5.0.2
  _ZN12QSoundEffect9setSourceERK4QUrl@Base 5.0.2
- (subst)_ZN12QSoundEffect9setVolumeE{qreal}@Base 5.0.2
+ _ZN12QSoundEffect9setVolumeEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN12QSoundEffect9setVolumeE{qreal}@Base 5.0.2
  _ZN12QSoundEffectC1EP7QObject@Base 5.0.2
  _ZN12QSoundEffectC2EP7QObject@Base 5.0.2
  _ZN12QSoundEffectD0Ev@Base 5.0.2
@@ -502,7 +512,8 @@
  _ZN14QMediaRecorder12mutedChangedEb@Base 5.0.2
  _ZN14QMediaRecorder12stateChangedENS_5StateE@Base 5.0.2
  _ZN14QMediaRecorder13statusChangedENS_6StatusE@Base 5.0.2
- (subst)_ZN14QMediaRecorder13volumeChangedE{qreal}@Base 5.0.2
+ _ZN14QMediaRecorder13volumeChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN14QMediaRecorder13volumeChangedE{qreal}@Base 5.0.2
  _ZN14QMediaRecorder14setMediaObjectEP12QMediaObject@Base 5.0.2
  _ZN14QMediaRecorder15durationChangedEx@Base 5.0.2
  _ZN14QMediaRecorder15metaDataChangedERK7QStringRK8QVariant@Base 5.0.2
@@ -523,7 +534,8 @@
  _ZN14QMediaRecorder5pauseEv@Base 5.0.2
  _ZN14QMediaRecorder6recordEv@Base 5.0.2
  _ZN14QMediaRecorder8setMutedEb@Base 5.0.2
- (subst)_ZN14QMediaRecorder9setVolumeE{qreal}@Base 5.0.2
+ _ZN14QMediaRecorder9setVolumeEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN14QMediaRecorder9setVolumeE{qreal}@Base 5.0.2
  _ZN14QMediaRecorderC1EP12QMediaObjectP7QObject@Base 5.0.2
  _ZN14QMediaRecorderC1ER21QMediaRecorderPrivateP12QMediaObjectP7QObject@Base 5.0.2
  _ZN14QMediaRecorderC2EP12QMediaObjectP7QObject@Base 5.0.2
@@ -556,23 +568,29 @@
  _ZN15QCameraExposure11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2
  _ZN15QCameraExposure11qt_metacastEPKc@Base 5.0.2
  _ZN15QCameraExposure12setFlashModeE6QFlagsINS_9FlashModeEE@Base 5.0.2
- (subst)_ZN15QCameraExposure15apertureChangedE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure15apertureChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure15apertureChangedE{qreal}@Base 5.0.2
  _ZN15QCameraExposure15setAutoApertureEv@Base 5.0.2
  _ZN15QCameraExposure15setExposureModeENS_12ExposureModeE@Base 5.0.2
  _ZN15QCameraExposure15setMeteringModeENS_12MeteringModeE@Base 5.0.2
  _ZN15QCameraExposure16staticMetaObjectE@Base 5.0.2
- (subst)_ZN15QCameraExposure17setManualApertureE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure17setManualApertureEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure17setManualApertureE{qreal}@Base 5.0.2
  _ZN15QCameraExposure19setAutoShutterSpeedEv@Base 5.0.2
- (subst)_ZN15QCameraExposure19shutterSpeedChangedE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure19shutterSpeedChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure19shutterSpeedChangedE{qreal}@Base 5.0.2
  _ZN15QCameraExposure20apertureRangeChangedEv@Base 5.0.2
  _ZN15QCameraExposure20setSpotMeteringPointERK7QPointF@Base 5.0.2
  _ZN15QCameraExposure21isoSensitivityChangedEi@Base 5.0.2
  _ZN15QCameraExposure21setAutoIsoSensitivityEv@Base 5.0.2
- (subst)_ZN15QCameraExposure21setManualShutterSpeedE{qreal}@Base 5.0.2
- (subst)_ZN15QCameraExposure23setExposureCompensationE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure21setManualShutterSpeedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure21setManualShutterSpeedE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure23setExposureCompensationEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure23setExposureCompensationE{qreal}@Base 5.0.2
  _ZN15QCameraExposure23setManualIsoSensitivityEi@Base 5.0.2
  _ZN15QCameraExposure24shutterSpeedRangeChangedEv@Base 5.0.2
- (subst)_ZN15QCameraExposure27exposureCompensationChangedE{qreal}@Base 5.0.2
+ _ZN15QCameraExposure27exposureCompensationChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN15QCameraExposure27exposureCompensationChangedE{qreal}@Base 5.0.2
  _ZN15QCameraExposureC1EP7QCamera@Base 5.0.2
  _ZN15QCameraExposureC2EP7QCamera@Base 5.0.2
  _ZN15QCameraExposureD0Ev@Base 5.0.2
@@ -656,12 +674,18 @@
  _ZN18QCameraZoomControl11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2
  _ZN18QCameraZoomControl11qt_metacastEPKc@Base 5.0.2
  _ZN18QCameraZoomControl16staticMetaObjectE@Base 5.0.2
- (subst)_ZN18QCameraZoomControl25currentDigitalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN18QCameraZoomControl25currentOpticalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN18QCameraZoomControl25maximumDigitalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN18QCameraZoomControl25maximumOpticalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN18QCameraZoomControl27requestedDigitalZoomChangedE{qreal}@Base 5.0.2
- (subst)_ZN18QCameraZoomControl27requestedOpticalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl25currentDigitalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl25currentDigitalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl25currentOpticalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl25currentOpticalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl25maximumDigitalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl25maximumDigitalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl25maximumOpticalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl25maximumOpticalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl27requestedDigitalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl27requestedDigitalZoomChangedE{qreal}@Base 5.0.2
+ _ZN18QCameraZoomControl27requestedOpticalZoomChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN18QCameraZoomControl27requestedOpticalZoomChangedE{qreal}@Base 5.0.2
  _ZN18QCameraZoomControlC1EP7QObject@Base 5.0.2
  _ZN18QCameraZoomControlC2EP7QObject@Base 5.0.2
  _ZN18QCameraZoomControlD0Ev@Base 5.0.2
@@ -780,7 +804,8 @@
  _ZN19QMediaPlayerControl16staticMetaObjectE@Base 5.0.2
  _ZN19QMediaPlayerControl18mediaStatusChangedEN12QMediaPlayer11MediaStatusE@Base 5.0.2
  _ZN19QMediaPlayerControl19bufferStatusChangedEi@Base 5.0.2
- (subst)_ZN19QMediaPlayerControl19playbackRateChangedE{qreal}@Base 5.0.2
+ _ZN19QMediaPlayerControl19playbackRateChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN19QMediaPlayerControl19playbackRateChangedE{qreal}@Base 5.0.2
  _ZN19QMediaPlayerControl21audioAvailableChangedEb@Base 5.0.2
  _ZN19QMediaPlayerControl21videoAvailableChangedEb@Base 5.0.2
  _ZN19QMediaPlayerControl30availablePlaybackRangesChangedERK15QMediaTimeRange@Base 5.0.2
@@ -806,7 +831,8 @@
  _ZN19QPlaylistFileParserD2Ev@Base 5.0.2
  _ZN19QVideoSurfaceFormat11setPropertyEPKcRK8QVariant@Base 5.0.2
  _ZN19QVideoSurfaceFormat11setViewportERK5QRect@Base 5.0.2
- (subst)_ZN19QVideoSurfaceFormat12setFrameRateE{qreal}@Base 5.0.2
+ _ZN19QVideoSurfaceFormat12setFrameRateEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN19QVideoSurfaceFormat12setFrameRateE{qreal}@Base 5.0.2
  _ZN19QVideoSurfaceFormat12setFrameSizeERK5QSize@Base 5.0.2
  _ZN19QVideoSurfaceFormat12setFrameSizeEii@Base 5.0.2
  _ZN19QVideoSurfaceFormat18setYCbCrColorSpaceENS_15YCbCrColorSpaceE@Base 5.0.2
@@ -870,7 +896,8 @@
  _ZN20QAudioDecoderControlD0Ev@Base 5.0.2
  _ZN20QAudioDecoderControlD1Ev@Base 5.0.2
  _ZN20QAudioDecoderControlD2Ev@Base 5.0.2
- (subst)_ZN20QAudioHelperInternal16qMultiplySamplesE{qreal}RK12QAudioFormatPKvPvi@Base 5.0.2
+ _ZN20QAudioHelperInternal16qMultiplySamplesEdRK12QAudioFormatPKvPvi@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN20QAudioHelperInternal16qMultiplySamplesE{qreal}RK12QAudioFormatPKvPvi@Base 5.0.2
  _ZN20QImageEncoderControl11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2
  _ZN20QImageEncoderControl11qt_metacastEPKc@Base 5.0.2
  _ZN20QImageEncoderControl16staticMetaObjectE@Base 5.0.2
@@ -958,7 +985,8 @@
  _ZN21QMediaRecorderControl12mutedChangedEb@Base 5.0.2
  _ZN21QMediaRecorderControl12stateChangedEN14QMediaRecorder5StateE@Base 5.0.2
  _ZN21QMediaRecorderControl13statusChangedEN14QMediaRecorder6StatusE@Base 5.0.2
- (subst)_ZN21QMediaRecorderControl13volumeChangedE{qreal}@Base 5.0.2
+ _ZN21QMediaRecorderControl13volumeChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN21QMediaRecorderControl13volumeChangedE{qreal}@Base 5.0.2
  _ZN21QMediaRecorderControl15durationChangedEx@Base 5.0.2
  _ZN21QMediaRecorderControl16staticMetaObjectE@Base 5.0.2
  _ZN21QMediaRecorderControl21actualLocationChangedERK4QUrl@Base 5.0.2
@@ -979,7 +1007,8 @@
  _ZN21QMediaServiceProviderD2Ev@Base 5.0.2
  _ZN21QVideoEncoderSettings10setBitRateEi@Base 5.0.2
  _ZN21QVideoEncoderSettings10setQualityEN11QMultimedia15EncodingQualityE@Base 5.0.2
- (subst)_ZN21QVideoEncoderSettings12setFrameRateE{qreal}@Base 5.0.2
+ _ZN21QVideoEncoderSettings12setFrameRateEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN21QVideoEncoderSettings12setFrameRateE{qreal}@Base 5.0.2
  _ZN21QVideoEncoderSettings13setResolutionERK5QSize@Base 5.0.2
  _ZN21QVideoEncoderSettings13setResolutionEii@Base 5.0.2
  _ZN21QVideoEncoderSettings15setEncodingModeEN11QMultimedia12EncodingModeE@Base 5.0.2
@@ -1022,13 +1051,18 @@
  _ZN22QCameraFeedbackControlD2Ev@Base 5.0.2
  _ZN22QCameraImageProcessing11qt_metacallEN11QMetaObject4CallEiPPv@Base 5.0.2
  _ZN22QCameraImageProcessing11qt_metacastEPKc@Base 5.0.2
- (subst)_ZN22QCameraImageProcessing11setContrastE{qreal}@Base 5.0.2
- (subst)_ZN22QCameraImageProcessing13setSaturationE{qreal}@Base 5.0.2
+ _ZN22QCameraImageProcessing11setContrastEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN22QCameraImageProcessing11setContrastE{qreal}@Base 5.0.2
+ _ZN22QCameraImageProcessing13setSaturationEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN22QCameraImageProcessing13setSaturationE{qreal}@Base 5.0.2
  _ZN22QCameraImageProcessing16staticMetaObjectE@Base 5.0.2
- (subst)_ZN22QCameraImageProcessing17setDenoisingLevelE{qreal}@Base 5.0.2
- (subst)_ZN22QCameraImageProcessing18setSharpeningLevelE{qreal}@Base 5.0.2
+ _ZN22QCameraImageProcessing17setDenoisingLevelEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN22QCameraImageProcessing17setDenoisingLevelE{qreal}@Base 5.0.2
+ _ZN22QCameraImageProcessing18setSharpeningLevelEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN22QCameraImageProcessing18setSharpeningLevelE{qreal}@Base 5.0.2
  _ZN22QCameraImageProcessing19setWhiteBalanceModeENS_16WhiteBalanceModeE@Base 5.0.2
- (subst)_ZN22QCameraImageProcessing21setManualWhiteBalanceE{qreal}@Base 5.0.2
+ _ZN22QCameraImageProcessing21setManualWhiteBalanceEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN22QCameraImageProcessing21setManualWhiteBalanceE{qreal}@Base 5.0.2
  _ZN22QCameraImageProcessingC1EP7QCamera@Base 5.0.2
  _ZN22QCameraImageProcessingC2EP7QCamera@Base 5.0.2
  _ZN22QCameraImageProcessingD0Ev@Base 5.0.2
@@ -1264,7 +1298,8 @@
  _ZN28QMediaGaplessPlaybackControl16nextMediaChangedERK13QMediaContent@Base 5.0.2
  _ZN28QMediaGaplessPlaybackControl16staticMetaObjectE@Base 5.0.2
  _ZN28QMediaGaplessPlaybackControl19advancedToNextMediaEv@Base 5.0.2
- (subst)_ZN28QMediaGaplessPlaybackControl20crossfadeTimeChangedE{qreal}@Base 5.0.2
+ _ZN28QMediaGaplessPlaybackControl20crossfadeTimeChangedEd@Base 5.1.1+git20131205+8230c02-0ubuntu7
+#MISSING: 5.1.1+git20131205+8230c02-0ubuntu7# (subst)_ZN28QMediaGaplessPlaybackControl20crossfadeTimeChangedE{qreal}@Base 5.0.2
  _ZN28QMediaGaplessPlaybackControlC1EP7QObject@Base 5.0.2
  _ZN28QMediaGaplessPlaybackControlC2EP7QObject@Base 5.0.2
  _ZN28QMediaGaplessPlaybackControlD0Ev@Base 5.0.2

=== modified file 'debian/libqt5multimediaquick-p5-touch.postrm'
--- debian/libqt5multimediaquick-p5-touch.postrm	2013-09-20 20:15:35 +0000
+++ debian/libqt5multimediaquick-p5-touch.postrm	2014-02-26 20:49:23 +0000
@@ -2,7 +2,7 @@
 divert_dir="/var/lib/$pkg-diverted"
 
 if [ remove = "$1" -o abort-install = "$1" -o disappear = "$1" -o purge = "$1" ]; then
-  for version in  5.0.2 5.0 5; do
+  for version in  5.2.1 5.2 5; do
     dpkg-divert --package "$pkg" --remove --rename \
       --divert \
       "$divert_dir"/libQt5MultimediaQuick_p.so.$version.diverted-$pkg \

=== modified file 'debian/libqt5multimediaquick-p5-touch.preinst'
--- debian/libqt5multimediaquick-p5-touch.preinst	2013-09-20 20:15:35 +0000
+++ debian/libqt5multimediaquick-p5-touch.preinst	2014-02-26 20:49:23 +0000
@@ -6,7 +6,7 @@
     mkdir -p "$divert_dir"
   fi
 
-  for version in 5.0.2 5.0 5; do
+  for version in 5.2.1 5.2 5; do
     dpkg-divert --package "$pkg" --add --rename \
       --divert \
       "$divert_dir"/libQt5MultimediaQuick_p.so.$version.diverted-$pkg \

=== modified file 'debian/qtmultimedia5-touch-dev.install'
--- debian/qtmultimedia5-touch-dev.install	2013-09-19 11:12:34 +0000
+++ debian/qtmultimedia5-touch-dev.install	2014-02-26 20:49:23 +0000
@@ -193,6 +193,11 @@
 usr/lib/*/pkgconfig/Qt5Multimedia.pc
 usr/lib/*/pkgconfig/Qt5MultimediaQuick_p.pc
 usr/lib/*/pkgconfig/Qt5MultimediaWidgets.pc
-usr/share/qt5/mkspecs/modules/qt_lib_multimedia.pri
-usr/share/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
-usr/share/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimedia_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_multimediawidgets_private.pri
+usr/lib/*/qt5/mkspecs/modules/qt_lib_qtmultimediaquicktools_private.pri
+usr/include/qt5/QtMultimedia/QtMultimediaDepends
+usr/include/qt5/QtMultimediaWidgets/QtMultimediaWidgetsDepends
+usr/include/qt5/QtMultimediaQuick_p/QtMultimediaQuick_pDepends

=== modified file 'debian/rules'
--- debian/rules	2013-11-25 14:42:05 +0000
+++ debian/rules	2014-02-26 20:49:23 +0000
@@ -56,6 +56,7 @@
 		debian/libqt5multimedia5-touch-plugins.preinst
 	sed "s/__ARCH__/$(DEB_HOST_MULTIARCH)/g" -i \
 		debian/libqt5multimedia5-touch-plugins.postrm
+	./debian/syncqt.pl -version 5.1.1
 	qmake CONFIG+=mir
 
 override_dh_auto_install-arch:

=== added file 'debian/syncqt.pl'
--- debian/syncqt.pl	1970-01-01 00:00:00 +0000
+++ debian/syncqt.pl	2014-02-26 20:49:23 +0000
@@ -0,0 +1,1223 @@
+#!/usr/bin/env perl
+#############################################################################
+##
+## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+## Contact: http://www.qt-project.org/legal
+##
+## This file is part of the build configuration tools of the Qt Toolkit.
+##
+## $QT_BEGIN_LICENSE:LGPL$
+## Commercial License Usage
+## Licensees holding valid commercial Qt licenses may use this file in
+## accordance with the commercial license agreement provided with the
+## Software or, alternatively, in accordance with the terms contained in
+## a written agreement between you and Digia.  For licensing terms and
+## conditions see http://qt.digia.com/licensing.  For further information
+## use the contact form at http://qt.digia.com/contact-us.
+##
+## GNU Lesser General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU Lesser
+## General Public License version 2.1 as published by the Free Software
+## Foundation and appearing in the file LICENSE.LGPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU Lesser General Public License version 2.1 requirements
+## will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+##
+## In addition, as a special exception, Digia gives you certain additional
+## rights.  These rights are described in the Digia Qt LGPL Exception
+## version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+##
+## GNU General Public License Usage
+## Alternatively, this file may be used under the terms of the GNU
+## General Public License version 3.0 as published by the Free Software
+## Foundation and appearing in the file LICENSE.GPL included in the
+## packaging of this file.  Please review the following information to
+## ensure the GNU General Public License version 3.0 requirements will be
+## met: http://www.gnu.org/copyleft/gpl.html.
+##
+##
+## $QT_END_LICENSE$
+##
+#############################################################################
+
+#
+# Synchronizes Qt header files - internal development tool.
+#
+
+# use packages -------------------------------------------------------
+use File::Basename;
+use File::Path;
+use File::Spec;
+use Cwd;
+use Cwd 'abs_path';
+use Config;
+use strict;
+use warnings;
+use English qw(-no_match_vars );
+
+my $normalizePath_fixDrive = ($^O eq "msys" ? 1 : 0);
+
+######################################################################
+# Syntax:  normalizePath(\$path)
+# Params:  Reference to a path that's going to be normalized.
+#
+# Purpose: Converts the path into a form that can be used as include
+#          path from C++ sources and qmake's .pro files.
+#          Only relevant on Windows.
+# Returns: -none-
+######################################################################
+sub normalizePath {
+    my $s = shift;
+    $$s =~ s=\\=/=g;
+    if ($normalizePath_fixDrive && ($$s =~ m,^/([a-zA-Z])/(.*), || $$s =~ m,^([a-zA-Z]):/(.*),)) {
+        $$s = lc($1) . ":/$2";
+    }
+}
+
+# set output basedir to be where ever syncqt is run from
+our $out_basedir = getcwd();
+normalizePath(\$out_basedir);
+our $basedir;
+our $quoted_basedir;
+
+# Make sure we use Windows line endings for chomp and friends on Windows.
+$INPUT_RECORD_SEPARATOR = "\r\n" if ($^O eq "msys");
+
+# will be defined based on the modules sync.profile
+our (%modules, %moduleheaders, @allmoduleheadersprivate, %classnames, %explicitheaders, %deprecatedheaders);
+our @qpa_headers = ();
+
+# global variables (modified by options)
+my $isunix = 0;
+my $module = 0;
+my $showonly = 0;
+my $verbose_level = 1;
+my $remove_stale = 1;
+my $force_win = 0;
+my $force_relative = 0;
+my $check_includes = 0;
+my $copy_headers = 0;
+my $create_private_headers = 1;
+my $minimal = 0;
+my $module_version = 0;
+my @modules_to_sync ;
+$force_relative = 1 if ( -d "/System/Library/Frameworks" );
+
+
+# functions ----------------------------------------------------------
+
+######################################################################
+# Syntax:  showUsage()
+# Params:  -none-
+#
+# Purpose: Show the usage of the script.
+# Returns: -none-
+######################################################################
+sub showUsage
+{
+    print "$0 usage:\n";
+    print "  <module directory>    Specifies which module to sync header files for (required for shadow builds!)\n\n";
+
+    print "  -copy                 Copy headers instead of include-fwd(default: " . ($copy_headers ? "yes" : "no") . ")\n";
+    print "  -remove-stale         Removes stale headers              (default: " . ($remove_stale ? "yes" : "no") . ")\n";
+    print "  -relative             Force relative symlinks            (default: " . ($force_relative ? "yes" : "no") . ")\n";
+    print "  -windows              Force platform to Windows          (default: " . ($force_win ? "yes" : "no") . ")\n";
+    print "  -showonly             Show action but not perform        (default: " . ($showonly ? "yes" : "no") . ")\n";
+    print "  -minimal              Do not create CamelCase headers    (default: " . ($minimal ? "yes" : "no") . ")\n";
+    print "  -outdir <PATH>        Specify output directory for sync  (default: $out_basedir)\n";
+    print "  -version <VERSION>    Specify the module's version       (default: detect from qglobal.h)\n";
+    print "  -quiet                Only report problems, not activity (same as -verbose 0)\n";
+    print "  -v, -verbose <level>  Sets the verbosity level (max. 4)  (default: $verbose_level)\n";
+    print "                        The short form increases the level by +1\n";
+    print "  -separate-module <NAME>:<PROFILEDIR>:<HEADERDIR>\n";
+    print "                        Create headers for <NAME> with original headers in\n";
+    print "                        <HEADERDIR> relative to <PROFILEDIR> \n";
+    print "  -private              Force copy private headers         (default: " . ($create_private_headers ? "yes" : "no") . ")\n";
+    print "  -help                 This help\n";
+    exit 0;
+}
+
+######################################################################
+# Syntax:  checkUnix()
+# Params:  -none-
+#
+# Purpose: Check if script runs on a Unix system or not. Cygwin
+#          systems are _not_ detected as Unix systems.
+# Returns: 1 if a unix system, else 0.
+######################################################################
+sub checkUnix {
+    my ($r) = 0;
+    if ( $force_win != 0) {
+        return 0;
+    } elsif ( -f "/bin/uname" ) {
+        $r = 1;
+        (-f "\\bin\\uname") && ($r = 0);
+    } elsif ( -f "/usr/bin/uname" ) {
+        $r = 1;
+        (-f "\\usr\\bin\\uname") && ($r = 0);
+    }
+    if($r) {
+        $_ = $Config{'osname'};
+        $r = 0 if( /(ms)|(cyg)win/i );
+    }
+    return $r;
+}
+
+sub checkRelative {
+    my ($dir) = @_;
+    return 0 if($dir =~ /^\//);
+    return 0 if(!checkUnix() && $dir =~ /[a-zA-Z]:[\/\\]/);
+    return 1;
+}
+
+######################################################################
+# Syntax:  shouldMasterInclude(iheader)
+# Params:  iheader, string, filename to verify inclusion
+#
+# Purpose: Determines if header should be in the master include file.
+# Returns: 0 if file contains "#pragma qt_no_master_include" or not
+#          able to open, else 1.
+######################################################################
+sub shouldMasterInclude {
+    my ($iheader) = @_;
+    return 0 if (basename($iheader) =~ /_/);
+    return 0 if (basename($iheader) =~ /qconfig/);
+    if (open(F, "<$iheader")) {
+        while (<F>) {
+            chomp;
+            return 0 if (/^\#pragma qt_no_master_include$/);
+        }
+        close(F);
+    } else {
+        return 0;
+    }
+    return 1;
+}
+
+######################################################################
+# Syntax:  classNames(iheader)
+# Params:  iheader, string, filename to parse for classname "symlinks"
+#
+# Purpose: Scans through iheader to find all classnames that should be
+#          synced into library's include structure.
+# Returns: List of all class names in a file.
+######################################################################
+sub classNames {
+    my @ret;
+    my ($iheader) = @_;
+
+    my $classname = $classnames{basename($iheader)};
+    push @ret, $classname if ($classname);
+
+    my $parsable = "";
+    if(open(F, "<$iheader")) {
+        while(<F>) {
+            my $line = $_;
+            chomp $line;
+                        chop $line if ($line =~ /\r$/);
+            if($line =~ /^\#/) {
+                return @ret if($line =~ m/^#pragma qt_sync_stop_processing/);
+                push(@ret, $1) if($line =~ m/^#pragma qt_class\(([^)]*)\)[\r\n]*$/);
+                $line = 0;
+            }
+            if($line) {
+                $line =~ s,//.*$,,; #remove c++ comments
+                $line .= ";" if($line =~ m/^Q_[A-Z_]*\(.*\)[\r\n]*$/); #qt macro
+                $line .= ";" if($line =~ m/^QT_(BEGIN|END)_HEADER[\r\n]*$/); #qt macro
+                $line .= ";" if($line =~ m/^QT_(BEGIN|END)_NAMESPACE(_[A-Z]+)*[\r\n]*$/); #qt macro
+                $line .= ";" if($line =~ m/^QT_MODULE\(.*\)[\r\n]*$/); # QT_MODULE macro
+                $parsable .= " " . $line;
+            }
+        }
+        close(F);
+    }
+
+    my $last_definition = 0;
+    my @namespaces;
+    for(my $i = 0; $i < length($parsable); $i++) {
+        my $definition = 0;
+        my $character = substr($parsable, $i, 1);
+        if($character eq "/" && substr($parsable, $i+1, 1) eq "*") { #I parse like this for greedy reasons
+            for($i+=2; $i < length($parsable); $i++) {
+                my $end = substr($parsable, $i, 2);
+                if($end eq "*/") {
+                    $last_definition = $i+2;
+                    $i++;
+                    last;
+                }
+            }
+        } elsif($character eq "{") {
+            my $brace_depth = 1;
+            my $block_start = $i + 1;
+          BLOCK: for($i+=1; $i < length($parsable); $i++) {
+              my $ignore = substr($parsable, $i, 1);
+              if($ignore eq "{") {
+                  $brace_depth++;
+              } elsif($ignore eq "}") {
+                  $brace_depth--;
+                  unless($brace_depth) {
+                      for(my $i2 = $i+1; $i2 < length($parsable); $i2++) {
+                          my $end = substr($parsable, $i2, 1);
+                          if($end eq ";" || $end ne " ") {
+                              $definition = substr($parsable, $last_definition, $block_start - $last_definition) . "}";
+                              $i = $i2 if($end eq ";");
+                              $last_definition = $i + 1;
+                              last BLOCK;
+                          }
+                      }
+                  }
+              }
+          }
+        } elsif($character eq ";") {
+            $definition = substr($parsable, $last_definition, $i - $last_definition + 1);
+            $last_definition = $i + 1;
+        } elsif($character eq "}") {
+            # a naked } must be a namespace ending
+            # if it's not a namespace, it's eaten by the loop above
+            pop @namespaces;
+            $last_definition = $i + 1;
+        }
+
+        if (substr($parsable, $last_definition, $i - $last_definition + 1) =~ m/ namespace ([^ ]*) /
+            && substr($parsable, $i+1, 1) eq "{") {
+            push @namespaces, $1;
+
+            # Eat the opening { so that the condensing loop above doesn't see it
+            $i++;
+            $last_definition = $i + 1;
+        }
+
+        if($definition) {
+            $definition =~ s=[\n\r]==g;
+            my @symbols;
+            my $post_kw = qr/Q_DECL_FINAL|final|sealed/; # add here macros and keywords that go after the class-name of a class definition
+            if($definition =~ m/^ *typedef *.*\(\*([^\)]*)\)\(.*\);$/) {
+                push @symbols, $1;
+            } elsif($definition =~ m/^ *typedef +(.*) +([^ ]*);$/) {
+                push @symbols, $2;
+            } elsif($definition =~ m/^ *(template *<.*> *)?(class|struct) +([^ ]* +)?((?!$post_kw)[^<\s]+) ?(<[^>]*> ?)?\s*(?:$post_kw)?\s*((,|:)\s*(public|protected|private) *.*)? *\{\}$/o) {
+                push @symbols, $4;
+            } elsif($definition =~ m/^ *Q_DECLARE_.*ITERATOR\((.*)\);$/) {
+                push @symbols, "Q" . $1 . "Iterator";
+                push @symbols, "QMutable" . $1 . "Iterator";
+            }
+
+            our $publicclassregexp;
+            foreach my $symbol (@symbols) {
+                $symbol = (join("::", @namespaces) . "::" . $symbol) if (scalar @namespaces);
+
+                if ($symbol =~ /^Q[^:]*$/) {           # no-namespace, starting with Q
+                    push @ret, $symbol;
+                } elsif (defined($publicclassregexp)) {
+                    push @ret, $symbol if ($symbol =~ $publicclassregexp);
+                }
+            }
+        }
+    }
+    return @ret;
+}
+
+sub make_path {
+    my ($dir, $lib, $be_verbose) = @_;
+    unless(-e $dir) {
+        mkpath $dir;
+        $dir = "<outbase>" . substr($dir, length($out_basedir)) if ($be_verbose < 3);
+        print "$lib: mkpath $dir\n" if ($be_verbose > 1);
+    }
+}
+
+######################################################################
+# Syntax:  syncHeader(header, iheader, copy, timestamp)
+# Params:  header, string, filename to create "symlink" for
+#          iheader, string, destination name of symlink
+#          copy, forces header to be a copy of iheader
+#          timestamp, the requested modification time if copying
+#
+# Purpose: Syncronizes header to iheader
+# Returns: 1 if successful, else 0.
+######################################################################
+sub syncHeader {
+    my ($lib, $header, $iheader, $copy, $ts) = @_;
+    normalizePath(\$iheader);
+    normalizePath(\$header);
+    return copyFile($lib, $iheader, $header) if($copy);
+
+    unless(-e $header) {
+        my $header_dir = dirname($header);
+        make_path($header_dir, $lib, $verbose_level);
+
+        #write it
+        my $iheader_out = fixPaths($iheader, $header_dir);
+        open(HEADER, ">$header") || die "Could not open $header for writing: $!\n";
+        print HEADER "#include \"$iheader_out\"\n";
+        close HEADER;
+        if(defined($ts)) {
+            utime(time, $ts, $header) or die "$iheader, $header";
+        }
+        return 1;
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  fixPaths(file, dir)
+# Params:  file, string, filepath to be made relative to dir
+#          dir, string, dirpath for point of origin
+#
+# Purpose: file is made relative (if possible) of dir.
+# Returns: String with the above applied conversion.
+######################################################################
+
+sub cleanupPath {
+    my ($file) = @_;
+    normalizePath(\$file);
+    while ($file =~ s,/[^/]+/\.\./,/,) {}
+    return $file;
+}
+
+sub fixPaths {
+    my ($file, $dir) = @_;
+
+    my $out = File::Spec->abs2rel(cleanupPath($file), cleanupPath($dir));
+    $out =~ s,\\,/,g;
+    return $out;
+}
+
+######################################################################
+# Syntax:  fileContents(filename)
+# Params:  filename, string, filename of file to return contents
+#
+# Purpose: Get the contents of a file.
+# Returns: String with contents of the file, or empty string if file
+#          doens't exist.
+# Warning: Dies if it does exist but script cannot get read access.
+######################################################################
+sub fileContents {
+    my ($filename) = @_;
+    my $filecontents = "";
+    if (-e $filename) {
+        open(I, "< $filename") || die "Could not open $filename for reading, read block?";
+        local $/;
+        binmode I;
+        $filecontents = <I>;
+        close I;
+    }
+    return $filecontents;
+}
+
+######################################################################
+# Syntax:  writeFile(filename, contents)
+# Params:  filename, string, filename of file to write
+#          contents, string, new contents for the file
+#
+# Purpose: Write file with given contents. If new contents match old
+#          ones, do no change the file's timestamp.
+# Returns: 1 if the file's contents changed.
+######################################################################
+sub writeFile {
+    my ($filename, $contents, $lib, $what) = @_;
+    my $oldcontents = fileContents($filename);
+    $oldcontents =~ s/\r//g; # remove \r's , so comparison is ok on all platforms
+    if ($oldcontents ne $contents) {
+        open(O, "> " . $filename) || die "Could not open $filename for writing: $!\n";
+        print O $contents;
+        close O;
+        if ($lib && $verbose_level) {
+            my $action = ($oldcontents eq "") ? "created" : "updated";
+            print "$lib: $action $what\n";
+        }
+        return 1;
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  fileCompare(file1, file2)
+# Params:  file1, string, filename of first file
+#          file2, string, filename of second file
+#
+# Purpose: Determines if files are equal, and which one is newer.
+# Returns: 0 if files are equal no matter the timestamp, -1 if file1
+#          is newer, 1 if file2 is newer.
+######################################################################
+sub fileCompare {
+    my ($file1, $file2) = @_;
+    my $file1contents = fileContents($file1);
+    my $file2contents = fileContents($file2);
+    if (! -e $file1) { return 1; }
+    if (! -e $file2) { return -1; }
+    return $file1contents ne $file2contents ? (stat($file2))[9] <=> (stat($file1))[9] : 0;
+}
+
+######################################################################
+# Syntax:  copyFile(file, ifile)
+# Params:  file, string, filename to create duplicate for
+#          ifile, string, destination name of duplicate
+#
+# Purpose: Keeps files in sync so changes in the newer file will be
+#          written to the other.
+# Returns: 1 if files were synced, else 0.
+# Warning: Dies if script cannot get write access.
+######################################################################
+sub copyFile
+{
+    my ($lib, $file,$ifile, $copy,$knowdiff,$filecontents,$ifilecontents) = @_;
+    # Bi-directional synchronization
+    open( I, "< " . $file ) || die "Could not open $file for reading";
+    local $/;
+    binmode I;
+    $filecontents = <I>;
+    close I;
+    if ( open(I, "< " . $ifile) ) {
+        local $/;
+        binmode I;
+        $ifilecontents = <I>;
+        close I;
+        $copy = fileCompare($file, $ifile);
+        $knowdiff = 0,
+    } else {
+        $copy = -1;
+        $knowdiff = 1;
+    }
+
+    if ( $knowdiff || ($filecontents ne $ifilecontents) ) {
+        if ( $copy > 0 ) {
+            my $file_dir = dirname($file);
+            make_path($file_dir, $lib, $verbose_level);
+            open(O, "> " . $file) || die "Could not open $file for writing (no write permission?)";
+            local $/;
+            binmode O;
+            print O $ifilecontents;
+            close O;
+            utime time, (stat($ifile))[9], $file;
+            return 1;
+        } elsif ( $copy < 0 ) {
+            my $ifile_dir = dirname($ifile);
+            make_path($ifile_dir, $lib, $verbose_level);
+            open(O, "> " . $ifile) || die "Could not open $ifile for writing (no write permission?)";
+            local $/;
+            binmode O;
+            print O $filecontents;
+            close O;
+            utime time, (stat($file))[9], $ifile;
+            return 1;
+        }
+    }
+    return 0;
+}
+
+######################################################################
+# Syntax:  findFiles(dir, match, descend)
+# Params:  dir, string, directory to search for name
+#          match, string, regular expression to match in dir
+#          descend, integer, 0 = non-recursive search
+#                            1 = recurse search into subdirectories
+#
+# Purpose: Finds files matching a regular expression.
+# Returns: List of matching files.
+#
+# Examples:
+#   findFiles("/usr","\.cpp$",1)  - finds .cpp files in /usr and below
+#   findFiles("/tmp","^#",0)      - finds #* files in /tmp
+######################################################################
+sub findFiles {
+    my ($dir,$match,$descend) = @_;
+    my ($file,$p,@files);
+    local(*D);
+    normalizePath(\$dir);
+    ($dir eq "") && ($dir = ".");
+    if ( opendir(D,$dir) ) {
+        if ( $dir eq "." ) {
+            $dir = "";
+        } else {
+            ($dir =~ /\/$/) || ($dir .= "/");
+        }
+        foreach $file ( sort readdir(D) ) {
+            next if ( $file  =~ /^\.\.?$/ );
+            $p = $file;
+            ($file =~ /$match/) && (push @files, $p);
+            if ( $descend && -d $p && ! -l $p ) {
+                push @files, &findFiles($p,$match,$descend);
+            }
+        }
+        closedir(D);
+    }
+    return @files;
+}
+
+sub listSubdirs {
+    my @subdirs = @_;
+    foreach my $subdir (@subdirs) {
+        opendir DIR, $subdir or die "Huh, directory ".$subdir." cannot be opened.";
+        foreach my $t (sort readdir(DIR)) {
+            push @subdirs, "$subdir/$t" if(-d "$subdir/$t" && !($t eq ".") &&
+                                           !($t eq "..") && !($t eq ".obj") &&
+                                           !($t eq ".moc") && !($t eq ".rcc") &&
+                                           !($t eq ".uic") && !($t eq "build") &&
+                                           !($t eq "doc"));
+        }
+        closedir DIR;
+    }
+    return @subdirs;
+}
+
+######################################################################
+# Syntax:  loadSyncProfile()
+#
+# Purpose: Locates the sync.profile.
+# Returns: Hashmap of module name -> directory.
+######################################################################
+sub loadSyncProfile {
+    my ($srcbase, $outbase) = @_;
+    if ($verbose_level) {
+        print("<srcbase> = $$srcbase \n");
+        print("<outbase> = $$outbase \n");
+    }
+
+    my $syncprofile = "$$srcbase/sync.profile";
+    my $result;
+    unless ($result = do "$syncprofile") {
+        die "syncqt couldn't parse $syncprofile: $@" if $@;
+        die "syncqt couldn't execute $syncprofile: $!" unless defined $result;
+    }
+    return $result;
+}
+
+sub basePrettify {
+    my ($arg) = @_;
+    $$arg =~ s,^\Q$basedir\E,<srcbase>,;
+    $$arg =~ s,^\Q$out_basedir\E,<outbase>,;
+}
+
+sub cleanPath {
+    my ($arg) = @_;
+    while ($arg =~ s,[^/]+/\.\.(/|$),,) {}
+    return $arg;
+}
+
+sub locateSyncProfile
+{
+    my ($directory) = @_;
+    $directory = abs_path($directory);
+    while (1) {
+        my $file = $directory."/sync.profile";
+        return $file if (-e $file);
+        my $odir = $directory;
+        $directory = dirname($directory);
+        return undef if ($directory eq $odir);
+    }
+}
+
+sub isQpaHeader
+{
+    my ($header) = @_;
+    foreach my $qpa_header (@qpa_headers) {
+        return 1 if ($header =~ $qpa_header);
+    }
+    return 0;
+}
+
+# check if this is an in-source build, and if so use that as the basedir too
+$basedir = locateSyncProfile($out_basedir);
+if ($basedir) {
+    $basedir = dirname($basedir) ;
+    normalizePath(\$basedir);
+    $quoted_basedir = "\Q$basedir";
+}
+
+# --------------------------------------------------------------------
+# "main" function
+# --------------------------------------------------------------------
+
+while ( @ARGV ) {
+    my $var = 0;
+    my $val = 0;
+
+    #parse
+    my $arg = shift @ARGV;
+    if ($arg eq "-h" || $arg eq "-help" || $arg eq "-?" || $arg eq "?") {
+        $var = "show_help";
+        $val = "yes";
+    } elsif($arg eq "-copy") {
+        $var = "copy";
+        $val = "yes";
+    } elsif($arg eq "-o" || $arg eq "-outdir") {
+        $var = "output";
+        $val = shift @ARGV;
+    } elsif($arg eq "-showonly" || $arg eq "-remove-stale" || $arg eq "-windows" ||
+            $arg eq "-relative" || $arg eq "-check-includes") {
+        $var = substr($arg, 1);
+        $val = "yes";
+    } elsif($arg =~ /^-no-(.*)$/) {
+        $var = $1;
+        $val = "no";
+        #these are for commandline compat
+    } elsif($arg eq "-inc") {
+        $var = "output";
+        $val = shift @ARGV;
+    } elsif($arg eq "-module") {
+        $var = "module";
+        $val = shift @ARGV;
+    } elsif($arg eq "-separate-module") {
+        $var = "separate-module";
+        $val = shift @ARGV;
+    } elsif($arg eq "-show") {
+        $var = "showonly";
+        $val = "yes";
+    } elsif($arg eq "-quiet") {
+        $var = "verbose";
+        $val = "0";
+    } elsif($arg eq "-v") {
+        $var = "verbose";
+        $val = "yes";
+    } elsif($arg eq "-verbose") {
+        $var = "verbose";
+        $val = shift @ARGV;
+    } elsif($arg eq "-minimal") {
+        $var = "minimal";
+        $val = "yes";
+    } elsif($arg eq "-private") {
+        $var = "create_private_headers";
+        $val = "yes";
+    } elsif($arg eq "-version") {
+        $var = "version";
+        $val = shift @ARGV;
+    } elsif($arg =~/^-/) {
+        print "Unknown option: $arg\n\n" if(!$var);
+        showUsage();
+    } else {
+        $basedir = locateSyncProfile($arg);
+        die "Could not find a sync.profile for '$arg'\n" if (!$basedir);
+        $basedir = dirname($basedir);
+        normalizePath(\$basedir);
+        $quoted_basedir = "\Q$basedir";
+        $var = "ignore";
+    }
+
+    #do something
+    if(!$var || $var eq "show_help") {
+        print "Unknown option: $arg\n\n" if(!$var);
+        showUsage();
+    } elsif ($var eq "copy") {
+        if($val eq "yes") {
+            $copy_headers++;
+        } elsif($showonly) {
+            $copy_headers--;
+        }
+    } elsif ($var eq "showonly") {
+        if($val eq "yes") {
+            $showonly++;
+        } elsif($showonly) {
+            $showonly--;
+        }
+    } elsif ($var eq "verbose") {
+        if($val eq "yes") {
+            $verbose_level++;
+        } elsif($val eq "no" && $verbose_level) {
+            $verbose_level--;
+        } else {
+            $verbose_level = int($val);
+        }
+    } elsif ($var eq "check-includes") {
+        if($val eq "yes") {
+            $check_includes++;
+        } elsif($check_includes) {
+            $check_includes--;
+        }
+    } elsif ($var eq "remove-stale") {
+        if($val eq "yes") {
+            $remove_stale++;
+        } elsif($remove_stale) {
+            $remove_stale--;
+        }
+    } elsif ($var eq "windows") {
+        if($val eq "yes") {
+            $force_win++;
+        } elsif($force_win) {
+            $force_win--;
+        }
+    } elsif ($var eq "relative") {
+        if($val eq "yes") {
+            $force_relative++;
+        } elsif($force_relative) {
+            $force_relative--;
+        }
+    } elsif ($var eq "minimal") {
+        if($val eq "yes") {
+            $minimal++;
+        } elsif($minimal) {
+            $minimal--;
+        }
+    } elsif ($var eq "module") {
+        push @modules_to_sync, $val;
+    } elsif ($var eq "separate-module") {
+        my ($module, $prodir, $headerdir) = split(/:/, $val);
+        $modules{$module} = $prodir;
+        push @modules_to_sync, $module;
+        $moduleheaders{$module} = $headerdir;
+    } elsif ($var eq "version") {
+        if($val) {
+            $module_version = $val;
+        } else {
+            die "The -version option requires an argument";
+        }
+    } elsif ($var eq "output") {
+        my $outdir = $val;
+        if(checkRelative($outdir)) {
+            $out_basedir = getcwd();
+            chomp $out_basedir;
+            $out_basedir .= "/" . $outdir;
+        } else {
+            $out_basedir = $outdir;
+        }
+        normalizePath(\$out_basedir);
+    }
+}
+
+# if we have no $basedir we cannot be sure which sources you want, so die
+die "Could not find any sync.profile for your module!\nPass <module directory> to syncqt to sync your header files.\nsyncqt failed" if (!$basedir);
+
+my $class_lib_map_contents = "";
+our @ignore_headers = ();
+our @ignore_for_master_contents = ();
+our @ignore_for_include_check = ();
+our @ignore_for_qt_begin_namespace_check = ();
+our @ignore_for_qt_module_check = ();
+our %inject_headers = ();
+
+# load the module's sync.profile here, before we can
+loadSyncProfile(\$basedir, \$out_basedir);
+
+@modules_to_sync = keys(%modules) if($#modules_to_sync == -1);
+
+my %allmoduleheadersprivate = map { $_ => 1 } @allmoduleheadersprivate;
+
+$isunix = checkUnix; #cache checkUnix
+
+if (!$module_version) {
+    my $filco = fileContents($basedir."/src/corelib/global/qglobal.h");
+    if ($filco !~ m,.*^#[ \t]*define[ \t]+QT_VERSION_STR[ \t]+"([^"]+)".*,sm) {
+        die "Cannot determine Qt/Module version. Use -version.\n";
+    }
+    $module_version = $1;
+}
+foreach my $lib (@modules_to_sync) {
+    die "No such module: $lib" unless(defined $modules{$lib});
+
+    #iteration info
+    my $module = $modules{$lib};
+    my $is_qt = !($module =~ s/^!//);
+    my @dirs = split(/;/, $module);
+    my $dir = $dirs[0];
+
+    my $pathtoheaders = "";
+    $pathtoheaders = $moduleheaders{$lib} if ($moduleheaders{$lib});
+
+    my $allheadersprivate = 0;
+    $allheadersprivate = 1 if $allmoduleheadersprivate{$lib};
+
+    #information used after the syncing
+    my $pri_install_classes = "";
+    my $pri_install_files = "";
+    my $pri_install_pfiles = "";
+    my $pri_install_qpafiles = "";
+
+    my $libcapitals = uc($lib);
+    my $master_contents =
+        "#ifndef QT_".$libcapitals."_MODULE_H\n" .
+        "#define QT_".$libcapitals."_MODULE_H\n" .
+        "#include <$lib/${lib}Depends>\n";
+
+    #remove the old files
+    if($remove_stale) {
+        my %injections = ();
+        for my $p (keys %inject_headers) {
+            next unless ($p =~ /^\Q$dir\E(\/|$)/);
+            my $sp = $p;
+            $sp =~ s,^\Q$basedir\E/,$out_basedir/,;
+            for my $n (@{$inject_headers{$p}}) {
+                $injections{$sp."/".$n} = 1;
+            }
+        }
+        my @subdirs = ("$out_basedir/include/$lib");
+        foreach my $subdir (@subdirs) {
+            if (opendir DIR, $subdir) {
+                foreach my $t (sort { $b cmp $a } readdir(DIR)) {
+                    my $file = "$subdir/$t";
+                    if(-d $file) {
+                        push @subdirs, $file unless($t eq "." || $t eq "..");
+                    } else {
+                        my @files = ($file);
+                        #push @files, "$out_basedir/include/Qt/$t" if(-e "$out_basedir/include/Qt/$t");
+                        foreach my $file (@files) {
+                           my $remove_file = 0;
+                           if(open(F, "<$file")) {
+                                while(my $line = <F>) {
+                                    chomp $line;
+                                    if($line =~ /^\#include \"([^\"]*)\"$/) {
+                                        my $include = $1;
+                                        $include = $subdir . "/" . $include unless(substr($include, 0, 1) eq "/");
+                                        $remove_file = 1 unless(-e $include or defined $injections{cleanPath($include)});
+                                    } else {
+                                        $remove_file = 0;
+                                        last;
+                                    }
+                                }
+                                close(F);
+                                unlink $file if($remove_file);
+                            }
+                        }
+                    }
+                }
+                closedir DIR;
+            }
+
+        }
+    }
+
+    #create the new ones
+    foreach my $current_dir (@dirs) {
+        my $thisprivate = 0;
+        ($current_dir =~ s/^\^//) and $thisprivate = 1;
+        my @headers_paths = split(/;/, $pathtoheaders);
+        if (@headers_paths) {
+            @headers_paths = map { "$current_dir/$_" } @headers_paths;
+        } else {
+            push @headers_paths, $current_dir;
+        }
+
+        foreach my $headers_dir (@headers_paths) {
+            #calc subdirs
+            my @subdirs = listSubdirs($headers_dir);
+
+            #calc files and "copy" them
+            foreach my $subdir (@subdirs) {
+                my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
+                my $header_dirname = "";
+                foreach my $header (@headers) {
+                    $header = 0 if($header =~ /^ui_.*.h/);
+                    foreach (@ignore_headers) {
+                        $header = 0 if($header eq $_);
+                    }
+                    if($header) {
+                        my $header_copies = 0;
+                        #figure out if it is a public header
+                        my $public_header = $header;
+                        my $qpa_header = 0;
+                        if(isQpaHeader($public_header)) {
+                            $public_header = 0;
+                            $qpa_header = 1;
+                        } elsif($allheadersprivate || $thisprivate || $public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+                            $public_header = 0;
+                        } else {
+                            foreach (@ignore_for_master_contents) {
+                                $public_header = 0 if($header eq $_);
+                            }
+                        }
+
+                        my $iheader = $subdir . "/" . $header;
+                        my @classes = $public_header && (!$minimal && $is_qt) ? classNames($iheader) : ();
+                        if($showonly) {
+                            print "$header [$lib]\n";
+                            foreach(@classes) {
+                                print "SYMBOL: $_\n";
+                            }
+                        } else {
+                            my $ts = (stat($iheader))[9];
+                            #find out all the places it goes..
+                            my @headers;
+                            if ($public_header) {
+                                @headers = ( "$out_basedir/include/$lib/$header" );
+                                foreach my $full_class (@classes) {
+                                    my $header_base = basename($header);
+                                    # Strip namespaces:
+                                    my $class = $full_class;
+                                    $class =~ s/^.*:://;
+    #                               if ($class =~ m/::/) {
+    #                                  class =~ s,::,/,g;
+    #                               }
+
+                                    if (defined $explicitheaders{$lib}{$class}) {
+                                        $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$explicitheaders{$lib}{$class}", 0, $ts));
+                                    } else {
+                                        $class_lib_map_contents .= "QT_CLASS_LIB($full_class, $lib, $header_base)\n";
+                                        $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$class", "$out_basedir/include/$lib/$header", 0, $ts));
+                                    }
+                                }
+
+                                if ($explicitheaders{$lib}{basename($header)}) {
+                                    $header_copies++ if(syncHeader($lib, "$out_basedir/include/$lib/$explicitheaders{$lib}{basename($header)}", "$out_basedir/include/$lib/$header", 0, $ts));
+                                }
+
+                            } elsif ($create_private_headers && !$qpa_header) {
+                                @headers = ( "$out_basedir/include/$lib/$module_version/$lib/private/$header" );
+                            } elsif ($create_private_headers) {
+                                @headers = ( "$out_basedir/include/$lib/$module_version/$lib/qpa/$header" );
+                            }
+
+                            foreach(@headers) { #sync them
+                                $header_copies++ if (syncHeader($lib, $_, $iheader, $copy_headers, $ts));
+                            }
+
+                            if($public_header) {
+                                #put it into the master file
+                                $master_contents .= "#include \"$public_header\"\n" if (shouldMasterInclude($iheader));
+
+                                #deal with the install directives
+                                if($public_header) {
+                                    my $pri_install_iheader = fixPaths($iheader, $dir);
+                                    foreach my $class (@classes) {
+                                        # Strip namespaces:
+                                        $class =~ s/^.*:://;
+    #                                   if ($class =~ m/::/) {
+    #                                       $class =~ s,::,/,g;
+    #                                   }
+                                        my $class_header = fixPaths("$out_basedir/include/$lib/$class",
+                                                                    $dir) . " ";
+                                        $pri_install_classes .= $class_header
+                                                                    unless($pri_install_classes =~ $class_header);
+                                    }
+                                    if ($explicitheaders{$lib}{basename($iheader)}) {
+                                        my $compat_header = fixPaths("$out_basedir/include/$lib/$explicitheaders{$lib}{basename($iheader)}",
+                                                                     $dir) . " ";
+                                        $pri_install_files .= $compat_header unless($pri_install_files =~ $compat_header);
+                                    }
+                                    $pri_install_files.= "$pri_install_iheader ";;
+                                }
+                            }
+                            elsif ($qpa_header) {
+                                my $pri_install_iheader = fixPaths($iheader, $dir);
+                                $pri_install_qpafiles.= "$pri_install_iheader ";;
+                            }
+                            else {
+                                my $pri_install_iheader = fixPaths($iheader, $dir);
+                                $pri_install_pfiles.= "$pri_install_iheader ";;
+                            }
+                        }
+
+                        if ($verbose_level && $header_copies) {
+                            my $new_header_dirname = dirname($iheader);
+                            basePrettify(\$new_header_dirname) if ($new_header_dirname && $verbose_level < 2);
+                            my $header_base = basename($iheader);
+                            if ($verbose_level < 3) {
+                                my $line_prefix = ",";
+                                if ($new_header_dirname ne $header_dirname) {
+                                    $line_prefix = "$lib: created fwd-include header(s) for $new_header_dirname/ {";
+                                    $line_prefix = " }\n".$line_prefix if ($header_dirname);
+                                    $header_dirname = $new_header_dirname;
+                                } else {
+                                    $line_prefix = ",";
+                                }
+                                print "$line_prefix $header_base ($header_copies)";
+                            } else { # $verbose_level >= 3
+                                basePrettify(\$iheader) if ($verbose_level == 3);
+                                print "$lib: created $header_copies fwd-include headers for $iheader\n";
+                            }
+                        }
+                    }
+                }
+                print " }\n" if ($header_dirname && $verbose_level > 0 && $verbose_level < 3);
+            }
+        }
+    }
+
+    # close the master include:
+    $master_contents .=
+        "#include \"".lc($lib)."version.h\"\n" .
+        "#endif\n";
+
+    unless ($showonly || $minimal || !$is_qt) {
+        # create deprecated headers
+        my $first = 1;
+        while (my ($header, $include) = each %{$deprecatedheaders{$lib}}) {
+            my $public_header = 0;
+            $public_header = 1 unless ($allheadersprivate || ($header =~ /_p\.h$/));
+            next unless ($public_header || $create_private_headers);
+
+            my $header_path = "$out_basedir/include/$lib/";
+            unless ($public_header) {
+                $header_path .= "$module_version/$lib/private/";
+            }
+            $header_path .= "$header";
+
+            unless (-e $header_path) {
+                my $guard = "DEPRECATED_HEADER_" . $lib . "_" . $header;
+                $guard =~ s/([^a-zA-Z0-9_])/_/g;
+
+                my $header_dir = dirname($header_path);
+                make_path($header_dir, $lib, $verbose_level);
+
+                my $hdrcont =
+                    "#ifndef $guard\n" .
+                    "#define $guard\n";
+                my $warning = "Header <$lib/";
+                $warning .= "private/" unless ($public_header);
+                $warning .= "$header> is deprecated. Please include <$include> instead.";
+                $hdrcont .=
+                    "#if defined(__GNUC__)\n" .
+                    "#  warning $warning\n" .
+                    "#elif defined(_MSC_VER)\n" .
+                    "#  pragma message (\"$warning\")\n" .
+                    "#endif\n" .
+                    "#include <$include>\n";
+                if ($public_header) {
+                    $hdrcont .=
+                        "#if 0\n" .
+                        "#pragma qt_no_master_include\n" .
+                        "#endif\n";
+                }
+                $hdrcont .=
+                    "#endif\n";
+                if (writeFile($header_path, $hdrcont)) {
+                    if ($verbose_level < 3) {
+                        my $line_prefix = ",";
+                        $line_prefix = "$lib: created deprecated header(s) {" if ($first);
+                        print "$line_prefix $header";
+                    } else {
+                        print "$lib: created deprecated header $header => $include\n";
+                    }
+                    $first = 0;
+                }
+            }
+
+            my $addendum = fixPaths($header_path, $dir) . " ";
+            if ($public_header) {
+                $pri_install_files .=  $addendum;
+            } else {
+                $pri_install_pfiles .=  $addendum;
+            }
+        }
+        if ($verbose_level < 3) {
+            print " }\n" unless ($first);
+        }
+
+        # module version header
+        my $vheader = "$out_basedir/include/$lib/".lc($lib)."version.h";
+        my $VHeader = "$out_basedir/include/$lib/${lib}Version";
+        syncHeader($lib, $VHeader, $vheader, 0);
+        $pri_install_files .= fixPaths($vheader, $dir) . " ";
+        $pri_install_classes .= fixPaths($VHeader, $dir) . " ";
+        my @versions = split(/\./, $module_version);
+        my $modulehexstring = sprintf("0x%02X%02X%02X", $versions[0], $versions[1], $versions[2]);
+        my $vhdrcont =
+            "/* This file was generated by syncqt. */\n".
+            "#ifndef QT_".uc($lib)."_VERSION_H\n".
+            "#define QT_".uc($lib)."_VERSION_H\n".
+            "\n".
+            "#define ".uc($lib)."_VERSION_STR \"".$module_version."\"\n".
+            "\n".
+            "#define ".uc($lib)."_VERSION ".$modulehexstring."\n".
+            "\n".
+            "#endif // QT_".uc($lib)."_VERSION_H\n";
+        writeFile($vheader, $vhdrcont, $lib, "version header");
+
+        my $master_include = "$out_basedir/include/$lib/$lib";
+        $pri_install_files .= fixPaths($master_include, $dir) . " ";
+        writeFile($master_include, $master_contents, $lib, "master header");
+    }
+
+    unless ($showonly || $minimal) {
+        #handle the headers.pri for each module
+        my $headers_pri_contents = "";
+        $headers_pri_contents .= "SYNCQT.HEADER_FILES = $pri_install_files\n";
+        $headers_pri_contents .= "SYNCQT.HEADER_CLASSES = $pri_install_classes\n";
+        $headers_pri_contents .= "SYNCQT.PRIVATE_HEADER_FILES = $pri_install_pfiles\n";
+        $headers_pri_contents .= "SYNCQT.QPA_HEADER_FILES = $pri_install_qpafiles\n";
+        my $headers_pri_file = "$out_basedir/include/$lib/headers.pri";
+        writeFile($headers_pri_file, $headers_pri_contents, $lib, "headers.pri file");
+    }
+}
+
+if($check_includes) {
+    foreach my $lib (@modules_to_sync) {
+        next if ($modules{$lib} =~ /^!/);
+            #calc subdirs
+            my @subdirs = listSubdirs(map { s/^\^//; $_ } split(/;/, $modules{$lib}));
+
+            foreach my $subdir (@subdirs) {
+                my @headers = findFiles($subdir, "^[-a-z0-9_]*\\.h\$" , 0);
+                foreach my $header (@headers) {
+                    my $header_skip_qt_begin_namespace_test = 0;
+                    $header = 0 if($header =~ /^ui_.*.h/);
+                    $header = 0 if ($header eq lc($lib)."version.h");
+                    foreach (@ignore_headers) {
+                        $header = 0 if($header eq $_);
+                    }
+                    if($header) {
+                        my $public_header = $header;
+                        if($public_header =~ /_p.h$/ || $public_header =~ /_pch.h$/) {
+                            $public_header = 0;
+                        } elsif (isQpaHeader($public_header)) {
+                            $public_header = 0;
+                        } else {
+                            foreach (@ignore_for_master_contents) {
+                                $public_header = 0 if($header eq $_);
+                            }
+                            if($public_header) {
+                                foreach (@ignore_for_include_check) {
+                                    $public_header = 0 if($header eq $_);
+                                }
+                                foreach(@ignore_for_qt_begin_namespace_check) {
+                                    $header_skip_qt_begin_namespace_test = 1 if ($header eq $_);
+                                }
+                            }
+                        }
+
+                        my $iheader = $subdir . "/" . $header;
+                        if($public_header) {
+                            if(open(F, "<$iheader")) {
+                                my $qt_begin_namespace_found = 0;
+                                my $qt_end_namespace_found = 0;
+                                my $qt_namespace_suffix = "";
+                                my $line;
+                                my $stop_processing = 0;
+                                while($line = <F>) {
+                                    chomp $line;
+                                    my $output_line = 1;
+                                    if($line =~ /^ *\# *pragma (qt_no_included_check|qt_sync_stop_processing)/) {
+                                        $stop_processing = 1;
+                                        last;
+                                    } elsif($line =~ /^ *\# *include/) {
+                                        my $include = $line;
+                                        if($line =~ /<.*>/) {
+                                            $include =~ s,.*<(.*)>.*,$1,;
+                                        } elsif($line =~ /".*"/) {
+                                            $include =~ s,.*"(.*)".*,$1,;
+                                        } else {
+                                            $include = 0;
+                                        }
+                                        if($include) {
+                                            for my $trylib (keys(%modules)) {
+                                                if(-e "$out_basedir/include/$trylib/$include") {
+                                                    print "$lib: WARNING: $iheader includes $include when it should include $trylib/$include\n";
+                                                }
+                                            }
+                                        }
+                                    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_BEGIN_NAMESPACE(_[A-Z_]+)?\s*$/) {
+                                        $qt_namespace_suffix = defined($1) ? $1 : "";
+                                        $qt_begin_namespace_found = 1;
+                                    } elsif ($header_skip_qt_begin_namespace_test == 0 and $line =~ /^QT_END_NAMESPACE$qt_namespace_suffix\s*$/) {
+                                        $qt_end_namespace_found = 1;
+                                    }
+                                }
+
+                                if ($header_skip_qt_begin_namespace_test == 0 and $stop_processing  == 0) {
+                                    if ($qt_begin_namespace_found == 0) {
+                                        print "$lib: WARNING: $iheader does not include QT_BEGIN_NAMESPACE\n";
+                                    }
+
+                                    if ($qt_begin_namespace_found && $qt_end_namespace_found == 0) {
+                                        print "$lib: WARNING: $iheader has QT_BEGIN_NAMESPACE$qt_namespace_suffix but no QT_END_NAMESPACE$qt_namespace_suffix\n";
+                                    }
+                                }
+
+                                close(F);
+                            }
+                        }
+                    }
+                }
+            }
+    }
+}
+
+exit 0;