diff options
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/moc.prf | 5 | ||||
| -rw-r--r-- | mkspecs/features/uic.prf | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 250f57a265..8bd512844d 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -79,10 +79,7 @@ QMAKE_EXTRA_COMPILERS += moc_source INCREDIBUILD_XGE += moc_source #make sure we can include these files -moc_dir_short = $$MOC_DIR -contains(QMAKE_HOST.os,Windows):moc_dir_short ~= s,^.:,/, -contains(moc_dir_short, ^[/\\\\].*):INCLUDEPATH += $$MOC_DIR -else:INCLUDEPATH += $$OUT_PWD/$$MOC_DIR +INCLUDEPATH += $$absolute_path($$MOC_DIR, $$OUT_PWD) #auto depend on moc unix:!no_mocdepend { diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 679132f116..36ec185f7b 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -15,8 +15,5 @@ QMAKE_EXTRA_COMPILERS += uic INCREDIBUILD_XGE += uic !isEmpty(FORMS) { - ui_dir_short = $$UI_DIR - contains(QMAKE_HOST.os,Windows):ui_dir_short ~= s,^.:,/, - contains(ui_dir_short, ^[/\\\\].*):INCLUDEPATH += $$UI_DIR - else:INCLUDEPATH += $$OUT_PWD/$$UI_DIR + INCLUDEPATH += $$absolute_path($$UI_DIR, $$OUT_PWD) } |