diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:58:49 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-02-25 11:58:49 +0100 |
| commit | b44c6dfb1dc3ef3bc5c6ba8590f6329b50593c17 (patch) | |
| tree | 07216922d8ad6a262c2ee4d35611a34adf5caf83 /src/imports/builtins.pro | |
| parent | eb338eabd276487f7779d7b682e7369f3903313e (diff) | |
| parent | e8ca72d484c0e56f030e4742bb5f92b6f0555146 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I71384165752875c073dfbcbd279cfdc82eeea4dc
Diffstat (limited to 'src/imports/builtins.pro')
| -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 |