diff options
| author | kh <qtc-committer@nokia.com> | 2009-04-02 16:03:12 (GMT) |
|---|---|---|
| committer | kh <qtc-committer@nokia.com> | 2009-04-02 16:03:12 (GMT) |
| commit | 6a75563240adf2662a1fd5b931801513c099fb16 (patch) | |
| tree | 88fcc89d22309cf7f82751af2c80bf04e570e459 /mkspecs/features/uic.prf | |
| parent | 8eeda065bbf039bb3305d716b8163c723c7ad1c0 (diff) | |
| parent | c99638c9ba4b233c8d0e822a1bf6e26b885e029d (diff) | |
| download | Qt-6a75563240adf2662a1fd5b931801513c099fb16.zip Qt-6a75563240adf2662a1fd5b931801513c099fb16.tar.gz Qt-6a75563240adf2662a1fd5b931801513c099fb16.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'mkspecs/features/uic.prf')
| -rw-r--r-- | mkspecs/features/uic.prf | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mkspecs/features/uic.prf b/mkspecs/features/uic.prf index 885fad7..f03d623 100644 --- a/mkspecs/features/uic.prf +++ b/mkspecs/features/uic.prf @@ -34,7 +34,10 @@ isEmpty(QMAKE_MOD_UIC):QMAKE_MOD_UIC = ui_ INCREDIBUILD_XGE += uic } -INCLUDEPATH += $$UI_HEADERS_DIR +ui_dir_short = $$UI_HEADERS_DIR +win32:ui_dir_short ~= s,^.:,/, +contains(ui_dir_short, ^[/\\].*):INCLUDEPATH += $$UI_HEADERS_DIR +else:INCLUDEPATH += $$OUT_PWD/$$UI_HEADERS_DIR uic3 { isEmpty(FORMS3) { |