RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

instructions updated for Qt 5.5.1 build from git

This commit is contained in:
John Preston 2015-10-28 19:55:17 -04:00
parent 3edc46320d
commit ba6d56105f
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MSVC.md
View File

@ -160,14 +160,15 @@ and run
git clone git://code.qt.io/qt/qt5.git QtStatic git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic cd QtStatic
git checkout 5.5.1 git checkout 5.5
perl init-repository --module-subset=qtbase,qtimageformats perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.5.1
cd qtimageformats && git checkout v5.5.1 && cd ..
cd qtbase && git checkout v5.5.1 && cd ..
#####Apply the patch #####Apply the patch
cd qtbase cd qtbase && git apply ../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff && cd ..
git apply ../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff
cd ..
#####Building library #####Building library

9
QTCREATOR.md
View File

@ -93,14 +93,15 @@ In Terminal go to **/home/user/TBuild/Libraries** and run
git clone git://code.qt.io/qt/qt5.git QtStatic git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic cd QtStatic
git checkout 5.5.1 git checkout 5.5
perl init-repository --module-subset=qtbase,qtimageformats perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.5.1
cd qtimageformats && git checkout v5.5.1 && cd ..
cd qtbase && git checkout v5.5.1 && cd ..
#####Apply the patch #####Apply the patch
cd qtbase cd qtbase && git apply ../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff && cd ..
git apply ./../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff
cd ..
#####Building library #####Building library

11
Telegram/_qtbase_5_5_1_patch.diff
View File

@ -282,7 +282,7 @@ index 112bb8e..45be6c6 100644
+ } + }
+ } + }
+ } + }
+ +
+ families << family; + families << family;
} }
populateFromPattern(pattern); populateFromPattern(pattern);
@ -1149,7 +1149,7 @@ new file mode 100644
index 0000000..b47d332 index 0000000..b47d332
--- /dev/null --- /dev/null
+++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.cpp +++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.cpp
@@ -0,0 +1,26 @@ @@ -0,0 +1,25 @@
+/* +/*
+ * This file was generated by qdbusxml2cpp version 0.8 + * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqt_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputcontextproxy -c FcitxQtInputContextProxy interfaces/org.fcitx.Fcitx.InputContext.xml -i fcitxqtformattedpreedit.h -i fcitxqt_export.h
@ -1175,7 +1175,6 @@ index 0000000..b47d332
+FcitxQtInputContextProxy::~FcitxQtInputContextProxy() +FcitxQtInputContextProxy::~FcitxQtInputContextProxy()
+{ +{
+} +}
+
diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.h diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputcontextproxy.h
new file mode 100644 new file mode 100644
index 0000000..19874dc index 0000000..19874dc
@ -1494,7 +1493,7 @@ new file mode 100644
index 0000000..068f4c2 index 0000000..068f4c2
--- /dev/null --- /dev/null
+++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.cpp +++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.cpp
@@ -0,0 +1,26 @@ @@ -0,0 +1,25 @@
+/* +/*
+ * This file was generated by qdbusxml2cpp version 0.8 + * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod.xml -i fcitxqtinputmethoditem.h -i fcitxqt_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtinputmethodproxy -c FcitxQtInputMethodProxy interfaces/org.fcitx.Fcitx.InputMethod.xml -i fcitxqtinputmethoditem.h -i fcitxqt_export.h
@ -1520,7 +1519,6 @@ index 0000000..068f4c2
+FcitxQtInputMethodProxy::~FcitxQtInputMethodProxy() +FcitxQtInputMethodProxy::~FcitxQtInputMethodProxy()
+{ +{
+} +}
+
diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.h diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtinputmethodproxy.h
new file mode 100644 new file mode 100644
index 0000000..7aa37e2 index 0000000..7aa37e2
@ -1919,7 +1917,7 @@ new file mode 100644
index 0000000..7523a92 index 0000000..7523a92
--- /dev/null --- /dev/null
+++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.cpp +++ b/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.cpp
@@ -0,0 +1,26 @@ @@ -0,0 +1,25 @@
+/* +/*
+ * This file was generated by qdbusxml2cpp version 0.8 + * This file was generated by qdbusxml2cpp version 0.8
+ * Command line was: qdbusxml2cpp -N -p fcitxqtkeyboardproxy -c FcitxQtKeyboardProxy interfaces/org.fcitx.Fcitx.Keyboard.xml -i fcitxqtkeyboardlayout.h -i fcitxqt_export.h + * Command line was: qdbusxml2cpp -N -p fcitxqtkeyboardproxy -c FcitxQtKeyboardProxy interfaces/org.fcitx.Fcitx.Keyboard.xml -i fcitxqtkeyboardlayout.h -i fcitxqt_export.h
@ -1945,7 +1943,6 @@ index 0000000..7523a92
+FcitxQtKeyboardProxy::~FcitxQtKeyboardProxy() +FcitxQtKeyboardProxy::~FcitxQtKeyboardProxy()
+{ +{
+} +}
+
diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.h diff --git a/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.h b/src/plugins/platforminputcontexts/fcitx/fcitxqtkeyboardproxy.h
new file mode 100644 new file mode 100644
index 0000000..42a6561 index 0000000..42a6561

9
XCODE.md
View File

@ -142,14 +142,15 @@ In Terminal go to **/Users/user/TBuild/Libraries** and run
git clone git://code.qt.io/qt/qt5.git QtStatic git clone git://code.qt.io/qt/qt5.git QtStatic
cd QtStatic cd QtStatic
git checkout 5.5.1 git checkout 5.5
perl init-repository --module-subset=qtbase,qtimageformats perl init-repository --module-subset=qtbase,qtimageformats
git checkout v5.5.1
cd qtimageformats && git checkout v5.5.1 && cd ..
cd qtbase && git checkout v5.5.1 && cd ..
#####Apply the patch #####Apply the patch
cd qtbase cd qtbase && git apply ../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff && cd ..
git apply ./../../../tdesktop/Telegram/_qtbase_5_5_1_patch.diff
cd ..
#####Building library #####Building library