diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-06 15:35:19 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-07 19:54:39 +0100 |
| commit | 14382d77c50bc92dc5c02ca3d0d6c73e8df7e1fd (patch) | |
| tree | 07223907d1240abe90e22ac153651c9c3afad890 | |
| parent | 5a0ac34396fa73dc7c91399ff106097f690d8971 (diff) | |
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>
| -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) } |