diff options
author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-07 09:40:33 -0500 |
---|---|---|
committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-05-02 15:30:08 +0200 |
commit | 2e8b6dcb4a6fa8ff42e967eb5dc27a461e721858 (patch) | |
tree | cc930ccb8aa34e1726b6e4db6320e1f89de12457 | |
parent | 1606667d3ebd760368b949e0661294874959bb44 (diff) |
Install syncqt, and ensure it runs fine for external modules
-rwxr-xr-x | bin/syncqt | 8 | ||||
-rw-r--r-- | qtbase.pro | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/bin/syncqt b/bin/syncqt index 45ac9d0fb0..8fa253a733 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -558,8 +558,11 @@ sub locateSyncProfile # check if this is an in-source build, and if so use that as the basedir too $basedir = locateSyncProfile($out_basedir); -$basedir = dirname($basedir) if ($basedir); -$quoted_basedir = "\Q$basedir"; +if ($basedir) { + $basedir = dirname($basedir) ; + $basedir =~ s=\\=/=g; + $quoted_basedir = "\Q$basedir"; +} # -------------------------------------------------------------------- # "main" function @@ -624,6 +627,7 @@ while ( @ARGV ) { die "Could not find a sync.profile for '$arg'\n" if (!$basedir); $basedir = dirname($basedir); $basedir =~ s=\\=/=g; + $quoted_basedir = "\Q$basedir"; $var = "ignore"; } diff --git a/qtbase.pro b/qtbase.pro index d3ca3e1d9a..7e334501ae 100644 --- a/qtbase.pro +++ b/qtbase.pro @@ -122,6 +122,12 @@ win32 { } 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.path=$$[QT_INSTALL_DATA]/mkspecs mkspecs.files=$$QT_BUILD_TREE/mkspecs/qconfig.pri $$files($$QT_SOURCE_TREE/mkspecs/*) |