simplify code by using new $$absolute_path() function

Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 250f57a..8bd5128 100644 (file)
--- 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 679132f..36ec185 100644 (file)
--- 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)
 }