diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-05-08 03:50:50 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-08 20:03:49 +0200 |
| commit | 4a58853aeae02677e6ee1a0f0ef8839578c32573 (patch) | |
| tree | e8ea5c8fba2bac4792030aa188e6844d185a8c94 | |
| parent | bf82547b82600133ab75b69fee78aa5f6ec0f5f7 (diff) | |
Fix qpa files installation
qpa header files were not installed under qpa/.
Change-Id: I243c3a7e83a342f7485791a1a29b65c9a8f25d6b
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
| -rwxr-xr-x | bin/syncqt | 6 | ||||
| -rw-r--r-- | mkspecs/features/qt_installs.prf | 4 |
2 files changed, 10 insertions, 0 deletions
diff --git a/bin/syncqt b/bin/syncqt index 8b4ce6f46a..05597bbc15 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -860,6 +860,7 @@ foreach my $lib (@modules_to_sync) { my $pri_install_classes = ""; my $pri_install_files = ""; my $pri_install_pfiles = ""; + my $pri_install_qpafiles = ""; my $libcapitals = $lib; $libcapitals =~ y/a-z/A-Z/; @@ -1087,6 +1088,10 @@ foreach my $lib (@modules_to_sync) { $pri_install_files.= "$pri_install_iheader ";; } } + elsif ($qpa_header) { + my $pri_install_iheader = fixPaths($iheader, $current_dir); + $pri_install_qpafiles.= "$pri_install_iheader ";; + } else { my $pri_install_iheader = fixPaths($iheader, $current_dir); $pri_install_pfiles.= "$pri_install_iheader ";; @@ -1219,6 +1224,7 @@ foreach my $lib (@modules_to_sync) { $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"; if(-e $headers_pri_file) { open HEADERS_PRI_FILE, "<$headers_pri_file"; diff --git a/mkspecs/features/qt_installs.prf b/mkspecs/features/qt_installs.prf index 97e52f670d..45c0957a49 100644 --- a/mkspecs/features/qt_installs.prf +++ b/mkspecs/features/qt_installs.prf @@ -33,5 +33,9 @@ qt_install_headers { private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/$$TARGET/private INSTALLS += private_headers + + qpa_headers.files = $$SYNCQT.QPA_HEADER_FILES + qpa_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$$eval(QT.$${MODULE}.VERSION)/$$TARGET/qpa + INSTALLS += qpa_headers } |