diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-07 09:42:03 -0500 |
|---|---|---|
| committer | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-04-13 12:50:34 -0500 |
| commit | 43329cdbbc5605bccc0d61a1db0faf48fc2253d3 (patch) | |
| tree | a87e1c3aec39ef10ed505525c37fe16b172ea8b5 | |
| parent | 9b5b3f22b405f3ca5d71b7cef39bcc91c25acd10 (diff) | |
Make sure we install syncqt, so it's usable with external modules
| -rw-r--r-- | afterlive/qtbase/0004-Install-syncqt-and-ensure-it-runs-fine-for-external-.patch | 56 |
1 files changed, 56 insertions, 0 deletions
diff --git a/afterlive/qtbase/0004-Install-syncqt-and-ensure-it-runs-fine-for-external-.patch b/afterlive/qtbase/0004-Install-syncqt-and-ensure-it-runs-fine-for-external-.patch new file mode 100644 index 0000000..1f188e5 --- /dev/null +++ b/afterlive/qtbase/0004-Install-syncqt-and-ensure-it-runs-fine-for-external-.patch @@ -0,0 +1,56 @@ +From 4f734b306d66f6c51e14bd36e4ed3f69509af349 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 05d8ecb..9eb19c7 100755 +--- a/bin/syncqt ++++ b/bin/syncqt +@@ -556,8 +556,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 +@@ -622,6 +625,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 d3ca3e1..7e33450 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/*) +-- +1.7.3.2.343.g7d43d + |