diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-11 12:04:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:46:00 +0200 |
| commit | 0f548b1744e2ee296c9072e9327b05dd7cd8c2f8 (patch) | |
| tree | e39929fc94acb462e05d075fd7d3c0256f6635d4 | |
| parent | 6fb0b7f5fc68f9996905b12f08b4113e7cd22528 (diff) | |
remove backwards compatibility hacks
there won't be terribly many projects relying on it. now's the time to
find out for sure ...
this reverts commit 3279b07302fde0eb14f9b197c9ad2e14d512817e
Change-Id: Id36687ab3bfc7dd5ce35b584621a8f5b3ee00fc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
| -rw-r--r-- | mkspecs/features/moc.prf | 7 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 7 |
2 files changed, 0 insertions, 14 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 94f8100f88..cf19c6596c 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -86,13 +86,6 @@ contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/, contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR -# Backwards compatibility: Make shadow builds with default MOC_DIR work -# if the user did not add the source dir explicitly. -equals(MOC_DIR, .) { - CONFIG -= include_source_dir - CONFIG = include_source_dir $$CONFIG -} - #auto depend on moc unix:!no_mocdepend { moc_source.depends += $$first(QMAKE_MOC) diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index db08505bb0..9cb0773b8d 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -33,13 +33,6 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR } -# Backwards compatibility: Make shadow builds with default UI_DIR work -# if the user did not add the source dir explicitly. -equals(UI_DIR, .) { - CONFIG -= include_source_dir - CONFIG = include_source_dir $$CONFIG -} - uic3 { isEmpty(FORMS3) { UIC3_FORMS = FORMS |