1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Install syncqt, and ensure it runs fine for external modules

Browse Source
This commit is contained in:
Marius Storm-Olsen 2011-04-07 09:40:33 -05:00 committed by Olivier Goffart
parent 1606667d3e
commit 2e8b6dcb4a
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/syncqt
View File

@ -558,8 +558,11 @@ sub locateSyncProfile
# check if this is an in-source build, and if so use that as the basedir too # check if this is an in-source build, and if so use that as the basedir too
$basedir = locateSyncProfile($out_basedir); $basedir = locateSyncProfile($out_basedir);
$basedir = dirname($basedir) if ($basedir); if ($basedir) {
$quoted_basedir = "\Q$basedir"; $basedir = dirname($basedir) ;
$basedir =~ s=\\=/=g;
$quoted_basedir = "\Q$basedir";
}
# -------------------------------------------------------------------- # --------------------------------------------------------------------
# "main" function # "main" function
@ -624,6 +627,7 @@ while ( @ARGV ) {
die "Could not find a sync.profile for '$arg'\n" if (!$basedir); die "Could not find a sync.profile for '$arg'\n" if (!$basedir);
$basedir = dirname($basedir); $basedir = dirname($basedir);
$basedir =~ s=\\=/=g; $basedir =~ s=\\=/=g;
$quoted_basedir = "\Q$basedir";
$var = "ignore"; $var = "ignore";
} }

6
qtbase.pro
View File

@ -122,6 +122,12 @@ win32 {
} }
INSTALLS += qmake INSTALLS += qmake
#syncqt
syncqt.path=$$[QT_INSTALL_BINS]
syncqt.files=$$QT_BUILD_TREE/bin/syncqt
win32:syncqt.files=$$QT_BUILD_TREE/bin/syncqt.bat
INSTALLS += syncqt
#mkspecs #mkspecs
mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs mkspecs.path=$$[QT_INSTALL_DATA]/mkspecs
mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*) mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*)