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>
This commit is contained in:
Oswald Buddenhagen 2012-04-11 12:04:17 +02:00
parent 6fb0b7f5fc
commit 0f548b1744
2 changed files with 0 additions and 14 deletions

View File

@ -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)

View File

@ -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