From 2e8b6dcb4a6fa8ff42e967eb5dc27a461e721858 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Thu, 7 Apr 2011 09:40:33 -0500
Subject: [PATCH] Install syncqt, and ensure it runs fine for external modules
---
bin/syncqt | 8 ++++++--
qtbase.pro | 6 ++++++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/bin/syncqt b/bin/syncqt
index 45ac9d0fb0b..8fa253a733e 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 d3ca3e1d9ac..7e334501aeb 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/*)
--
GitLab