diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-04-24 16:03:18 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-04-24 17:09:36 +0000 |
| commit | f0487407a00f542f88aff0d00c0a0ce7d4b24f21 (patch) | |
| tree | 4836b25f4ef606bd9d03c27acb50a0e53486b548 | |
| parent | 2b6c91ff99401305a38687ae252d70c5227d293a (diff) | |
Revert "Fixup DLLDESTDIR for modules"
this "fixup" is not necessary since qtbase/5dbcced3bf, and it's rather
fishy to start with.
This reverts commit 9ae13b3fbe9f9c0847466796d35a0cf254b097c3.
Change-Id: I6c5e7e5fe65f795b421d9f9736b83af8a3bb29b6
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
| -rw-r--r-- | src/remoteobjects/remoteobjects.pro | 3 | ||||
| -rw-r--r-- | src/repparser/repparser.pro | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/src/remoteobjects/remoteobjects.pro b/src/remoteobjects/remoteobjects.pro index 4a3593a..9fb658a 100644 --- a/src/remoteobjects/remoteobjects.pro +++ b/src/remoteobjects/remoteobjects.pro @@ -13,9 +13,6 @@ OTHER_FILES += $$PWD/doc/qtremoteobjects.qdocconf \ load(qt_module) -# Fixup DLLDESTDIR from qt_module.pri -win32:!wince: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin - DEFINES += QT_NO_CAST_TO_ASCII QT_NO_CAST_FROM_ASCII QT_NO_CAST_FROM_BYTEARRAY QT_NO_URL_CAST_FROM_STRING INCLUDEPATH *= . diff --git a/src/repparser/repparser.pro b/src/repparser/repparser.pro index bc8c92f..4609b36 100644 --- a/src/repparser/repparser.pro +++ b/src/repparser/repparser.pro @@ -6,9 +6,6 @@ CONFIG += header_module load(qt_module) -# Fixup DLLDESTDIR from qt_module.pri -win32:!wince: DLLDESTDIR = $$MODULE_BASE_OUTDIR/bin - def_build = debug contains(QT_CONFIG, release, debug|release): def_build = release !debug_and_release|!build_all|CONFIG($$def_build, debug|release) { |