don't install headers into Qt/ any more
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>
Fri, 30 Nov 2012 14:03:26 +0000 (15:03 +0100)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Fri, 30 Nov 2012 20:57:49 +0000 (21:57 +0100)
this should have been part of 656e0d342.

Change-Id: I56e5d743a756e9236759595429de85754593638e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
mkspecs/features/qt_installs.prf

index 8cba5cc..b8d38ca 100644 (file)
 
 #headers
 qt_install_headers {
-    INSTALL_HEADERS = $$SYNCQT.HEADER_FILES
-
-    equals(TARGET, phonon) {
-        class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
-    } else {
-        flat_headers.files = $$INSTALL_HEADERS
-        flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt
-        INSTALLS += flat_headers
-
-        class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
-    }
     class_headers.files = $$SYNCQT.HEADER_CLASSES
+    class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
     INSTALLS += class_headers
 
-    targ_headers.files = $$INSTALL_HEADERS
+    targ_headers.files = $$SYNCQT.HEADER_FILES
     targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET
     INSTALLS += targ_headers