whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Oswald Buddenhagen 2012-12-06 15:35:19 +01:00 committed by The Qt Project
parent 5a0ac34396
commit 14382d77c5
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/moc.prf
View File

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

5
mkspecs/features/uic.prf
View File

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