API tools faq
paste
kenya888

Ubuntu QtCreator plugin patch to master

kenya888
Mar 7th, 2013
166
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Diff 12.12 KB | None | 0 0
raw download clone embed print report
  1. diff --git share/qtcreator/static.pro share/qtcreator/static.pro
  2. index 891708b..c7ecf96 100644
  3. --- share/qtcreator/static.pro
  4. +++ share/qtcreator/static.pro
  5. @@ -24,6 +24,7 @@ isEmpty(vcproj) {
  6.  }
  7.  
  8.  DATA_DIRS = \
  9. +    ubuntu \
  10.      welcomescreen \
  11.      examplebrowser \
  12.      snippets \
  13. diff --git share/qtcreator/templates/wizards/ubuntu/simple/[email protected] share/qtcreator/templates/wizards/ubuntu/simple/[email protected]
  14. new file mode 100644
  15. index 0000000..881e626
  16. Binary files /dev/null and share/qtcreator/templates/wizards/ubuntu/simple/[email protected] differ
  17. diff --git share/qtcreator/templates/wizards/ubuntu/tabs/[email protected] share/qtcreator/templates/wizards/ubuntu/tabs/[email protected]
  18. new file mode 100644
  19. index 0000000..881e626
  20. Binary files /dev/null and share/qtcreator/templates/wizards/ubuntu/tabs/[email protected] differ
  21. diff --git share/qtcreator/ubuntu/welcome/images/App-dev-tablet-GoMobile.png share/qtcreator/ubuntu/welcome/images/App-dev-tablet-GoMobile.png
  22. new file mode 100644
  23. index 0000000..6831eaf
  24. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/App-dev-tablet-GoMobile.png differ
  25. diff --git share/qtcreator/ubuntu/welcome/images/background-header-home.png share/qtcreator/ubuntu/welcome/images/background-header-home.png
  26. new file mode 100644
  27. index 0000000..0cf1ad7
  28. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/background-header-home.png differ
  29. diff --git share/qtcreator/ubuntu/welcome/images/banner-usc.jpg share/qtcreator/ubuntu/welcome/images/banner-usc.jpg
  30. new file mode 100644
  31. index 0000000..f9ceb10
  32. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/banner-usc.jpg differ
  33. diff --git share/qtcreator/ubuntu/welcome/images/bg_dotted.png share/qtcreator/ubuntu/welcome/images/bg_dotted.png
  34. new file mode 100644
  35. index 0000000..58ff604
  36. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/bg_dotted.png differ
  37. diff --git share/qtcreator/ubuntu/welcome/images/dotted-logo.png share/qtcreator/ubuntu/welcome/images/dotted-logo.png
  38. new file mode 100644
  39. index 0000000..d1f6553
  40. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/dotted-logo.png differ
  41. diff --git share/qtcreator/ubuntu/welcome/images/logo-ubuntu.png share/qtcreator/ubuntu/welcome/images/logo-ubuntu.png
  42. new file mode 100644
  43. index 0000000..816fae5
  44. Binary files /dev/null and share/qtcreator/ubuntu/welcome/images/logo-ubuntu.png differ
  45. diff --git src/libs/3rdparty/botan/botan.pri src/libs/3rdparty/botan/botan.pri
  46. index 3c65676..761ad78 100644
  47. --- src/libs/3rdparty/botan/botan.pri
  48. +++ src/libs/3rdparty/botan/botan.pri
  49. @@ -1,56 +1,3 @@
  50. -INCLUDEPATH *= $$PWD/..
  51. -HEADERS += $$PWD/botan.h
  52. +CONFIG += link_pkgconfig
  53. +PKGCONFIG += botan-1.10
  54.  
  55. -equals(USE_SYSTEM_BOTAN, 1) {
  56. -    DEFINES += USE_SYSTEM_BOTAN
  57. -    CONFIG += link_pkgconfig
  58. -    PKGCONFIG += botan-1.10
  59. -} else {
  60. -
  61. -SOURCES += $$PWD/botan.cpp
  62. -
  63. -CONFIG += exceptions
  64. -
  65. -DEPENDPATH += .
  66. -
  67. -DEFINES += BOTAN_DLL=
  68. -unix:DEFINES += BOTAN_TARGET_OS_HAS_GETTIMEOFDAY BOTAN_HAS_ALLOC_MMAP \
  69. -    BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM BOTAN_HAS_ENTROPY_SRC_EGD BOTAN_HAS_ENTROPY_SRC_FTW \
  70. -    BOTAN_HAS_ENTROPY_SRC_UNIX BOTAN_HAS_MUTEX_PTHREAD BOTAN_HAS_PIPE_UNIXFD_IO
  71. -*linux*:DEFINES += BOTAN_TARGET_OS_IS_LINUX BOTAN_TARGET_OS_HAS_CLOCK_GETTIME \
  72. -    BOTAN_TARGET_OS_HAS_DLOPEN BOTAN_TARGET_OS_HAS_GMTIME_R BOTAN_TARGET_OS_HAS_POSIX_MLOCK \
  73. -    BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE BOTAN_HAS_DYNAMIC_LOADER
  74. -macx:DEFINES += BOTAN_TARGET_OS_IS_DARWIN
  75. -*g++*:DEFINES += BOTAN_BUILD_COMPILER_IS_GCC
  76. -*clang*:DEFINES += BOTAN_BUILD_COMPILER_IS_CLANG
  77. -*icc*:DEFINES += BOTAN_BUILD_COMPILER_IS_INTEL
  78. -
  79. -CONFIG(x86_64):DEFINES += BOTAN_TARGET_ARCH_IS_X86_64
  80. -
  81. -win32 {
  82. -    DEFINES += BOTAN_TARGET_OS_IS_WINDOWS \
  83. -        BOTAN_TARGET_OS_HAS_LOADLIBRARY BOTAN_TARGET_OS_HAS_WIN32_GET_SYSTEMTIME \
  84. -        BOTAN_TARGET_OS_HAS_WIN32_VIRTUAL_LOCK BOTAN_HAS_DYNAMICALLY_LOADED_ENGINE \
  85. -        BOTAN_HAS_DYNAMIC_LOADER BOTAN_HAS_ENTROPY_SRC_CAPI BOTAN_HAS_ENTROPY_SRC_WIN32 \
  86. -        BOTAN_HAS_MUTEX_WIN32
  87. -
  88. -    win32-msvc* {
  89. -        QMAKE_CXXFLAGS += -wd4251 -wd4290 -wd4250
  90. -        DEFINES += BOTAN_BUILD_COMPILER_IS_MSVC BOTAN_TARGET_OS_HAS_GMTIME_S
  91. -    } else {
  92. -        QMAKE_CFLAGS += -fpermissive -finline-functions -Wno-long-long
  93. -        QMAKE_CXXFLAGS += -fpermissive -finline-functions -Wno-long-long
  94. -    }
  95. -    LIBS += -ladvapi32 -luser32
  96. -}
  97. -
  98. -unix:*-g++* {
  99. -    QMAKE_CFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
  100. -    QMAKE_CXXFLAGS += -fPIC -ansi -fpermissive -finline-functions -Wno-long-long
  101. -    QMAKE_CXXFLAGS_HIDESYMS -= -fvisibility-inlines-hidden # for ubuntu 7.04
  102. -}
  103. -
  104. -linux*|freebsd* {
  105. -    LIBS += -lrt
  106. -}
  107. -}
  108. diff --git src/libs/ssh/sshcryptofacility.cpp src/libs/ssh/sshcryptofacility.cpp
  109. index 255ef7e..5e2e9cf 100644
  110. --- src/libs/ssh/sshcryptofacility.cpp
  111. +++ src/libs/ssh/sshcryptofacility.cpp
  112. @@ -37,6 +37,11 @@
  113.  #include "sshpacket_p.h"
  114.  
  115.  #include <botan/botan.h>
  116. +#include <botan/cbc.h>
  117. +#include <botan/dsa.h>
  118. +#include <botan/pkcs8.h>
  119. +#include <botan/pubkey.h>
  120. +#include <botan/rsa.h>
  121.  
  122.  #include <QDebug>
  123.  #include <QList>
  124. diff --git src/libs/ssh/sshcryptofacility_p.h src/libs/ssh/sshcryptofacility_p.h
  125. index 704a4ee..8eee601 100644
  126. --- src/libs/ssh/sshcryptofacility_p.h
  127. +++ src/libs/ssh/sshcryptofacility_p.h
  128. @@ -31,9 +31,11 @@
  129.  #define SSHABSTRACTCRYPTOFACILITY_P_H
  130.  
  131.  #include <botan/botan.h>
  132. +#include <botan/hmac.h>
  133.  
  134.  #include <QByteArray>
  135.  #include <QScopedPointer>
  136. +#include <QSharedPointer>
  137.  
  138.  namespace QSsh {
  139.  namespace Internal {
  140. diff --git src/libs/ssh/sshkeyexchange.cpp src/libs/ssh/sshkeyexchange.cpp
  141. index b21f1ab..46135cb 100644
  142. --- src/libs/ssh/sshkeyexchange.cpp
  143. +++ src/libs/ssh/sshkeyexchange.cpp
  144. @@ -36,6 +36,12 @@
  145.  #include "sshincomingpacket_p.h"
  146.  
  147.  #include <botan/botan.h>
  148. +#include <botan/dh.h>
  149. +#include <botan/dl_group.h>
  150. +#include <botan/dsa.h>
  151. +#include <botan/pem.h>
  152. +#include <botan/pubkey.h>
  153. +#include <botan/rsa.h>
  154.  
  155.  #ifdef CREATOR_SSH_DEBUG
  156.  #include <iostream>
  157. diff --git src/libs/ssh/sshkeygenerator.cpp src/libs/ssh/sshkeygenerator.cpp
  158. index 736cc04..318a786 100644
  159. --- src/libs/ssh/sshkeygenerator.cpp
  160. +++ src/libs/ssh/sshkeygenerator.cpp
  161. @@ -34,6 +34,11 @@
  162.  #include "sshpacket_p.h"
  163.  
  164.  #include <botan/botan.h>
  165. +#include <botan/der_enc.h>
  166. +#include <botan/dsa.h>
  167. +#include <botan/pem.h>
  168. +#include <botan/pkcs8.h>
  169. +#include <botan/rsa.h>
  170.  
  171.  #include <QDateTime>
  172.  #include <QInputDialog>
  173. diff --git src/libs/ssh/sshkeypasswordretriever_p.h src/libs/ssh/sshkeypasswordretriever_p.h
  174. index 9ffdc90..6cdd7d6 100644
  175. --- src/libs/ssh/sshkeypasswordretriever_p.h
  176. +++ src/libs/ssh/sshkeypasswordretriever_p.h
  177. @@ -30,6 +30,7 @@
  178.  #define KEYPASSWORDRETRIEVER_H
  179.  
  180.  #include <botan/botan.h>
  181. +#include <botan/ui.h>
  182.  
  183.  #include <string>
  184.  
  185. diff --git src/libs/utils/consoleprocess_unix.cpp src/libs/utils/consoleprocess_unix.cpp
  186. index 367a0ab..0c032bc 100644
  187. --- src/libs/utils/consoleprocess_unix.cpp
  188. +++ src/libs/utils/consoleprocess_unix.cpp
  189. @@ -333,6 +333,7 @@ struct Terminal {
  190.  
  191.  static const Terminal knownTerminals[] =
  192.  {
  193. +    {"x-terminal-emulator", "-e"},
  194.      {"xterm", "-e"},
  195.      {"aterm", "-e"},
  196.      {"Eterm", "-e"},
  197. diff --git src/plugins/debugger/shared/shared.pri src/plugins/debugger/shared/shared.pri
  198. index 4b37004..5a214b2 100644
  199. --- src/plugins/debugger/shared/shared.pri
  200. +++ src/plugins/debugger/shared/shared.pri
  201. @@ -2,7 +2,6 @@ SOURCES += $$PWD/backtrace.cpp \
  202.             $$PWD/cdbsymbolpathlisteditor.cpp \
  203.             $$PWD/hostutils.cpp \
  204.             $$PWD/peutils.cpp
  205. -           $$PWD/peutils.h
  206.  
  207.  HEADERS += $$PWD/backtrace.h \
  208.             $$PWD/cdbsymbolpathlisteditor.h \
  209. diff --git src/plugins/help/helpplugin.cpp src/plugins/help/helpplugin.cpp
  210. index 9be566c..aee0b7f 100644
  211. --- src/plugins/help/helpplugin.cpp
  212. +++ src/plugins/help/helpplugin.cpp
  213. @@ -107,7 +107,7 @@ const char SB_OPENPAGES[] = "OpenPages";
  214.  #if defined(Q_OS_MAC)
  215.  #   define DOCPATH "/../Resources/doc/"
  216.  #else
  217. -#   define DOCPATH "/../share/doc/qtcreator/"
  218. +#   define DOCPATH "/../share/qtcreator/doc/"
  219.  #endif
  220.  
  221.  using namespace Core;
  222. diff --git src/plugins/plugins.pro src/plugins/plugins.pro
  223. index 49b816b..510f5d5 100644
  224. --- src/plugins/plugins.pro
  225. +++ src/plugins/plugins.pro
  226. @@ -47,7 +47,8 @@ SUBDIRS   = plugin_coreplugin \
  227.              plugin_madde \
  228.              plugin_valgrind \
  229.              plugin_todo \
  230. -            plugin_qnx
  231. +            plugin_qnx \
  232. +            plugin_ubuntu
  233.  
  234.  exists(../shared/qbs/qbs.pro):SUBDIRS += plugin_qbsprojectmanager
  235.  
  236. @@ -354,6 +355,11 @@ plugin_clearcase.depends = plugin_vcsbase
  237.  plugin_clearcase.depends += plugin_projectexplorer
  238.  plugin_clearcase.depends += plugin_coreplugin
  239.  
  240. +plugin_ubuntu.subdir = ubuntu
  241. +plugin_ubuntu.depends += plugin_coreplugin
  242. +plugin_ubuntu.depends += plugin_projectexplorer
  243. +plugin_ubuntu.depends += plugin_qmlprojectmanager
  244. +
  245.  plugin_pythoneditor.subdir = pythoneditor
  246.  plugin_pythoneditor.depends = plugin_coreplugin
  247.  plugin_pythoneditor.depends += plugin_cpptools
  248. diff --git src/plugins/ubuntu/images/device.png src/plugins/ubuntu/images/device.png
  249. new file mode 100644
  250. index 0000000..1dd5075
  251. Binary files /dev/null and src/plugins/ubuntu/images/device.png differ
  252. diff --git src/plugins/ubuntu/images/ubuntu-128.png src/plugins/ubuntu/images/ubuntu-128.png
  253. new file mode 100644
  254. index 0000000..3ccedaf
  255. Binary files /dev/null and src/plugins/ubuntu/images/ubuntu-128.png differ
  256. diff --git src/plugins/ubuntu/images/ubuntu-48.png src/plugins/ubuntu/images/ubuntu-48.png
  257. new file mode 100644
  258. index 0000000..ed09512
  259. Binary files /dev/null and src/plugins/ubuntu/images/ubuntu-48.png differ
  260. diff --git src/plugins/ubuntu/images/ubuntu-64.png src/plugins/ubuntu/images/ubuntu-64.png
  261. new file mode 100644
  262. index 0000000..d1dd44c
  263. Binary files /dev/null and src/plugins/ubuntu/images/ubuntu-64.png differ
  264. diff --git src/plugins/ubuntu/images/ubuntu-qtcreator.png src/plugins/ubuntu/images/ubuntu-qtcreator.png
  265. new file mode 100644
  266. index 0000000..8aa082e
  267. Binary files /dev/null and src/plugins/ubuntu/images/ubuntu-qtcreator.png differ
  268. diff --git src/qtcreatorplugin.pri src/qtcreatorplugin.pri
  269. index 8d60558..7aea4b3 100644
  270. --- src/qtcreatorplugin.pri
  271. +++ src/qtcreatorplugin.pri
  272. @@ -91,7 +91,7 @@ macx {
  273.          QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/$${PROVIDER}/
  274.          QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../../,-rpath,@executable_path/../
  275.      }
  276. -} else:linux-* {
  277. +} else:linux-*|glibc-*|hurd-* {
  278.      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
  279.      QMAKE_RPATHDIR += \$\$ORIGIN
  280.      QMAKE_RPATHDIR += \$\$ORIGIN/..
  281. @@ -107,7 +107,7 @@ CONFIG += include_source_dir
  282.  contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols
  283.  
  284.  CONFIG += plugin plugin_with_soname
  285. -linux*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  286. +linux*|glibc-*|hurd-*:QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
  287.  
  288.  !macx {
  289.      target.path = $$QTC_PREFIX/$$IDE_LIBRARY_BASENAME/qtcreator/plugins/$$PROVIDER
  290. diff --git src/rpath.pri src/rpath.pri
  291. index c352a82..39e68e7 100644
  292. --- src/rpath.pri
  293. +++ src/rpath.pri
  294. @@ -5,7 +5,7 @@ macx {
  295.          QMAKE_LFLAGS_SONAME = -Wl,-install_name,@rpath/PlugIns/
  296.          QMAKE_LFLAGS += -Wl,-rpath,@loader_path/../,-rpath,@executable_path/../
  297.      }
  298. -} else:linux-* {
  299. +} else:linux-*|glibc-*|hurd-* {
  300.      #do the rpath by hand since it's not possible to use ORIGIN in QMAKE_RPATHDIR
  301.      # this expands to $ORIGIN (after qmake and make), it does NOT read a qmake var
  302.      QMAKE_RPATHDIR += \$\$ORIGIN
  303. diff --git src/tools/qtcreatorwidgets/qtcreatorwidgets.pro src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
  304. index 89a7026..897a3ff 100644
  305. --- src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
  306. +++ src/tools/qtcreatorwidgets/qtcreatorwidgets.pro
  307. @@ -13,7 +13,7 @@ isEmpty(IDE_LIBRARY_BASENAME) {
  308.      IDE_LIBRARY_BASENAME = lib
  309.  }
  310.  
  311. -linux-*||win32 {
  312. +linux-*||win32||glibc-*||hurd-* {
  313.    # form abs path to qtcreator lib dir
  314.    QTC_LIBS=$$dirname(OUT_PWD)
  315.    QTC_LIBS=$$dirname(QTC_LIBS)
  316. @@ -21,7 +21,7 @@ linux-*||win32 {
  317.    QTC_LIBS=$$QTC_LIBS/$$IDE_LIBRARY_BASENAME/qtcreator
  318.  }
  319.  
  320. -linux-*{  
  321. +linux-*|glibc-*|hurd-*{  
  322.    QMAKE_RPATHDIR *= $$QTC_LIBS
  323.  }
Advertisement
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!