<commit_before>From d84df7f1dae7b2d6ab117ec79d3d45aca491a3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mika=20Bostr=C3=B6m?= <<EMAIL>>
Date: Fri, 17 Feb 2012 07:28:14 +0200
Subject: [PATCH] Fix modular build

Remove the abuses of DESTDIR macro. System paths are not writable, all
modules must go through install stage.
---
 src/imports/folderlistmodel/folderlistmodel.pro    |    1 -
 src/imports/localstorage/localstorage.pro          |    3 +--
 src/imports/qtquick2/qtquick2.pro                  |    1 -
 src/imports/testlib/testlib.pro                    |    2 --
 src/imports/xmllistmodel/xmllistmodel.pro          |    3 +--
 src/plugins/accessible/quick/quick.pro             |    1 -
 src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro   |    1 -
 .../qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro |    2 --
 src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro   |    1 -
 9 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index 26efc65..11987fe 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -7,7 +7,6 @@ QT += widgets declarative
 SOURCES += qdeclarativefolderlistmodel.cpp plugin.cpp
 HEADERS += qdeclarativefolderlistmodel.h
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index 51a69aa..970a884 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -6,10 +6,9 @@ QT += sql declarative declarative-private v8-private core-private
 
 SOURCES += plugin.cpp
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
-INSTALLS += target qmldir
\ No newline at end of file
+INSTALLS += target qmldir
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 3f76abd..255305f 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -10,7 +10,6 @@ QT += quick-private declarative-private
 OTHER_FILES += \
     qmldir
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index 3b8a5bf..42c520f 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -9,8 +9,6 @@ QT += declarative quick qmltest qmltest-private v8-private declarative-private c
 SOURCES += main.cpp
 HEADERS +=
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
-
 target.path += $$[QT_INSTALL_IMPORTS]/QtTest
 OTHER_IMPORT_FILES = \
     qmldir \
diff --git a/src/imports/xmllistmodel/xmllistmodel.pro b/src/imports/xmllistmodel/xmllistmodel.pro
index d8121e8..c53838c 100644
--- a/src/imports/xmllistmodel/xmllistmodel.pro
+++ b/src/imports/xmllistmodel/xmllistmodel.pro
@@ -7,10 +7,9 @@ QT += network declarative xmlpatterns declarative-private v8-private core-privat
 SOURCES += qdeclarativexmllistmodel.cpp plugin.cpp
 HEADERS += qdeclarativexmllistmodel_p.h
 
-DESTDIR = $$QT.declarative.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
-INSTALLS += target qmldir
\ No newline at end of file
+INSTALLS += target qmldir
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index 97a1d50..7ec92b1 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -5,7 +5,6 @@ load(qt_plugin)
 include ($$PWD/../shared/qaccessiblebase.pri)
 
 QT += core-private gui-private v8-private declarative-private quick-private
-DESTDIR = $$QT.gui.plugins/accessible
 
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
 
diff --git a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
index c1ca2a5..80ed2bd 100644
--- a/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
+++ b/src/plugins/qmltooling/qmldbg_ost/qmldbg_ost.pro
@@ -3,7 +3,6 @@ QT       += declarative network
 
 load(qt_plugin)
 
-QTDIR_build:DESTDIR  = $$QT_BUILD_TREE/plugins/qmltooling
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index b9c6584..122bd99 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -5,8 +5,6 @@ QT       += declarative-private quick-private core-private gui-private opengl-pr
 
 load(qt_plugin)
 
-DESTDIR  = $$QT.declarative.plugins/qmltooling
-
 INCLUDEPATH *= $$PWD $$PWD/../shared
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index 8ab507c..c5e48f0 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -5,7 +5,6 @@ QT       += declarative-private network
 
 load(qt_plugin)
 
-DESTDIR = $$QT.declarative.plugins/qmltooling
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, declarative)"
 
 SOURCES += \
-- 
1.7.9

<commit_msg>QtDeclarative: update modular build patch<commit_after>commit <PASSWORD>
Author: <NAME> <<EMAIL>>
Date:   Thu Mar 22 15:43:16 2012 +0200

    Fix modular build
    
    Remove the abuses of DESTDIR macro. System paths are not writable, all
    modules must go through install stage.

diff --git a/src/imports/folderlistmodel/folderlistmodel.pro b/src/imports/folderlistmodel/folderlistmodel.pro
index f30c2b2..94d15e4 100644
--- a/src/imports/folderlistmodel/folderlistmodel.pro
+++ b/src/imports/folderlistmodel/folderlistmodel.pro
@@ -10,7 +10,6 @@ HEADERS += qquickfolderlistmodel.h \
     fileproperty_p.h \
     fileinfothread_p.h
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/localstorage/localstorage.pro b/src/imports/localstorage/localstorage.pro
index fa1718d..a18a6d1 100644
--- a/src/imports/localstorage/localstorage.pro
+++ b/src/imports/localstorage/localstorage.pro
@@ -8,7 +8,6 @@ SOURCES += plugin.cpp
 
 OTHER_FILES += localstorage.json
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/qtquick2/qtquick2.pro b/src/imports/qtquick2/qtquick2.pro
index 3a95c5f..e4a62e6 100644
--- a/src/imports/qtquick2/qtquick2.pro
+++ b/src/imports/qtquick2/qtquick2.pro
@@ -10,7 +10,6 @@ QT += quick-private qml-private
 OTHER_FILES += \
     qmldir
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 
 qmldir.files += $$PWD/qmldir
diff --git a/src/imports/testlib/testlib.pro b/src/imports/testlib/testlib.pro
index dfb23ce..564b0ab 100644
--- a/src/imports/testlib/testlib.pro
+++ b/src/imports/testlib/testlib.pro
@@ -10,8 +10,6 @@ SOURCES += main.cpp
 
 OTHER_FILES += testlib.json
 
-DESTDIR = $$QT.qml.imports/$$TARGETPATH
-
 target.path += $$[QT_INSTALL_IMPORTS]/QtTest
 OTHER_IMPORT_FILES = \
     qmldir \
diff --git a/src/plugins/accessible/quick/quick.pro b/src/plugins/accessible/quick/quick.pro
index 213d2e8..e931d5f 100644
--- a/src/plugins/accessible/quick/quick.pro
+++ b/src/plugins/accessible/quick/quick.pro
@@ -5,7 +5,6 @@ load(qt_plugin)
 include ($$PWD/../shared/qaccessiblebase.pri)
 
 QT += core-private gui-private v8-private qml-private quick-private
-DESTDIR = $$QT.gui.plugins/accessible
 
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, accessibility)"
 
diff --git a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
index 2d4de57..ba0e2b5 100644
--- a/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
+++ b/src/plugins/qmltooling/qmldbg_qtquick2/qmldbg_qtquick2.pro
@@ -5,8 +5,6 @@ QT       += qml-private quick-private core-private gui-private v8-private
 
 load(qt_plugin)
 
-DESTDIR  = $$QT.qml.plugins/qmltooling
-
 INCLUDEPATH *= $$PWD $$PWD/../shared
 
 SOURCES += \
diff --git a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
index fdd1f6e..b525c5a 100644
--- a/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
+++ b/src/plugins/qmltooling/qmldbg_tcp/qmldbg_tcp.pro
@@ -5,7 +5,6 @@ QT       += qml-private network
 
 load(qt_plugin)
 
-DESTDIR = $$QT.qml.plugins/qmltooling
 QTDIR_build:REQUIRES += "contains(QT_CONFIG, qml)"
 
 SOURCES += \

{'fraction_non_alphanumeric': 0.14383638611079896, 'fraction_numerical': 0.048207663782447466, 'mean_word_length': 4.059693007390563, 'pattern_counts': {'":': 0, '<': 9, '<?xml version=': 0, '>': 9, 'https://': 0, 'lorem ipsum': 0, 'www.': 0, 'xml': 13}, 'pii_count': 0, 'substrings_counts': 0, 'word_list_counts': {'cursed_substrings.json': 0, 'profanity_word_list.json': 0, 'sexual_word_list.json': 0, 'zh_pornsignals.json': 0}}
{'dir': 'git-commits-cleaned', 'id': '6432427', 'n_tokens_mistral': 3925, 'n_tokens_neox': 3542, 'n_words': 506}