diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-02-20 13:32:29 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-20 15:46:02 +0100 |
| commit | f7680b55f0d1d1ef102d40166f74cf4eee605e44 (patch) | |
| tree | 664adf66fb8386e13117e576e887bab07557bddc | |
| parent | 22e940b2c97364df12dbdfb51e9fc5a8eaf8d268 (diff) | |
Copy builtins.qmltypes into the 'imports' directory
We used to copy builtins.qmltypes into qtbase/imports/QtQuick1, but
install it into into $QT_INSTALL_IMPORTS. Unify this by copying
it also directly into the imports directory.
Change-Id: I9fe2feae4ff0da49d59d787b92ba2d7d4c47461d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| -rw-r--r-- | src/imports/builtins.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/imports/builtins.pro b/src/imports/builtins.pro index 8893e487..51a0b214 100644 --- a/src/imports/builtins.pro +++ b/src/imports/builtins.pro @@ -5,7 +5,7 @@ exists($$[QT_HOST_PREFIX]/.qmake.cache) { # These bizarre rules copy the file to the qtbase build directory builtins2build.input = qmltypes_file - builtins2build.output = $$[QT_INSTALL_IMPORTS]/QtQuick1/builtins.qmltypes + builtins2build.output = $$[QT_INSTALL_IMPORTS]/builtins.qmltypes !contains(TEMPLATE, vc.*): builtins2build.variable_out = PRE_TARGETDEPS builtins2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} builtins2build.name = COPY ${QMAKE_FILE_IN} @@ -17,5 +17,5 @@ exists($$[QT_HOST_PREFIX]/.qmake.cache) { # Install rules builtins.base = $$_PRO_FILE_PWD_ builtins.files = $$qmltypes_file -builtins.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH +builtins.path = $$[QT_INSTALL_IMPORTS] INSTALLS += builtins |