Ubuntu Terminal App

Merge lp:~hiroshidi/ubuntu-terminal-app/konsole-qml-plugin-buildfix into lp:~ubuntu-terminal-dev/ubuntu-terminal-app/plugin

  1. konsole-qml-plugin-buildfix
  2. Merge into plugin
Proposed by Dmitry Zagnoyko
Status: Merged
Approved by: Francis Ginther
Approved revision: 10
Merged at revision: 10
Proposed branch: lp:~hiroshidi/ubuntu-terminal-app/konsole-qml-plugin-buildfix
Merge into: lp:~ubuntu-terminal-dev/ubuntu-terminal-app/plugin
Diff against target: 196 lines (+94/-88)
3 files modified
konsole-qml-plugin.pro (+94/-2)
plugin.pri (+0/-21)
src/src.pro (+0/-65)
To merge this branch: bzr merge lp:~hiroshidi/ubuntu-terminal-app/konsole-qml-plugin-buildfix
Reviewer Review Type Date Requested Status
Dmitry Zagnoyko Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Michael Hall Approve
Review via email: mp+161291@code.launchpad.net

Commit message

changed project structure

Description of the change

Changed project structure. This should help with building.

To post a comment you must log in.
Revision history for this message
Michael Hall (mhall119) wrote :

Builds fine

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~hiroshidi/ubuntu-terminal-app/konsole-qml-plugin-buildfix/+merge/161291/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-autolanding/1/
Executed test runs:
    FAILURE: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-quantal-amd64-autolanding/1/console
    SUCCESS: http://91.189.93.125:8080/job/ubuntu-terminal-app-plugin-raring-amd64-autolanding/1

review: Needs Fixing (continuous-integration)
Revision history for this message
Dmitry Zagnoyko (hiroshidi) wrote :

quantal build - fails due to missing qt5-proper ppa. Ppa should be added to quantal building environment.
raring build - success.

review: Needs Fixing
Revision history for this message
Francis Ginther (fginther) wrote :

Build configuration has been updated. MP should be re-approved.

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)
Revision history for this message
Dmitry Zagnoyko (hiroshidi) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'konsole-qml-plugin.pro'
2--- konsole-qml-plugin.pro 2013-04-19 17:59:20 +0000
3+++ konsole-qml-plugin.pro 2013-04-27 15:45:31 +0000
4@@ -1,2 +1,94 @@
5-TEMPLATE = subdirs
6-SUBDIRS += src
7+#########################################
8+## CONFIGS
9+#########################################
10+
11+TEMPLATE = lib
12+CONFIG += qt plugin hide_symbols
13+QT += qml quick widgets
14+
15+DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
16+
17+TARGET = kdekonsole
18+PLUGIN_IMPORT_PATH = org/kde/konsole
19+PLUGIN_ASSETS = $$PWD/assets/*
20+
21+#########################################
22+## SOURCES
23+#########################################
24+
25+SOURCES += \
26+ $$PWD/src/plugin.cpp \
27+ $$PWD/src/Pty.cpp \
28+ $$PWD/src/kptyprocess.cpp \
29+ $$PWD/src/kptydevice.cpp \
30+ $$PWD/src/kpty.cpp \
31+ $$PWD/src/kprocess.cpp \
32+ $$PWD/src/ShellCommand.cpp \
33+ $$PWD/src/Vt102Emulation.cpp \
34+ $$PWD/src/tools.cpp \
35+ $$PWD/src/Session.cpp \
36+ $$PWD/src/Screen.cpp \
37+ $$PWD/src/KeyboardTranslator.cpp \
38+ $$PWD/src/Emulation.cpp \
39+ $$PWD/src/History.cpp \
40+ $$PWD/src/BlockArray.cpp \
41+ $$PWD/src/TerminalCharacterDecoder.cpp \
42+ $$PWD/src/konsole_wcwidth.cpp \
43+ $$PWD/src/ScreenWindow.cpp \
44+ $$PWD/src/Filter.cpp \
45+ $$PWD/src/ColorScheme.cpp \
46+ $$PWD/src/TerminalDisplay.cpp \
47+ $$PWD/src/ksession.cpp
48+
49+HEADERS += \
50+ $$PWD/src/plugin.h \
51+ $$PWD/src/Pty.h \
52+ $$PWD/src/kptyprocess.h \
53+ $$PWD/src/kptydevice.h \
54+ $$PWD/src/kpty.h \
55+ $$PWD/src/kpty_p.h \
56+ $$PWD/src/kprocess.h \
57+ $$PWD/src/ShellCommand.h \
58+ $$PWD/src/Vt102Emulation.h \
59+ $$PWD/src/tools.h \
60+ $$PWD/src/Session.h \
61+ $$PWD/src/Screen.h \
62+ $$PWD/src/KeyboardTranslator.h \
63+ $$PWD/src/Emulation.h \
64+ $$PWD/src/Character.h \
65+ $$PWD/src/History.h \
66+ $$PWD/src/CharacterColor.h \
67+ $$PWD/src/BlockArray.h \
68+ $$PWD/src/TerminalCharacterDecoder.h \
69+ $$PWD/src/konsole_wcwidth.h \
70+ $$PWD/src/ScreenWindow.h \
71+ $$PWD/src/DefaultTranslatorText.h \
72+ $$PWD/src/LineFont.h \
73+ $$PWD/src/Filter.h \
74+ $$PWD/src/ExtendedDefaultTranslator.h \
75+ $$PWD/src/ColorTables.h \
76+ $$PWD/src/ColorScheme.h \
77+ $$PWD/src/TerminalDisplay.h \
78+ $$PWD/src/ksession.h
79+
80+OTHER_FILES += \
81+ $$PWD/src/qmldir \
82+ $$PWD/src/plugins.qmltypes
83+
84+MOC_DIR = $$PWD/.moc
85+OBJECTS_DIR = $$PWD/.obj
86+
87+#########################################
88+## INTALLS
89+#########################################
90+
91+target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
92+
93+assets.files += $$PLUGIN_ASSETS
94+assets.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
95+
96+qmldir.files += $$PWD/src/qmldir \
97+ $$PWD/src/plugins.qmltypes
98+qmldir.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
99+
100+INSTALLS += target qmldir assets
101
102=== removed file 'plugin.pri'
103--- plugin.pri 2013-04-20 12:49:46 +0000
104+++ plugin.pri 1970-01-01 00:00:00 +0000
105@@ -1,21 +0,0 @@
106-TEMPLATE = lib
107-CONFIG += qt plugin hide_symbols
108-QT += qml quick
109-
110-DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
111-
112-target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
113-
114-assets.files += $$PLUGIN_ASSETS
115-assets.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
116-
117-qmldir.files += $$_PRO_FILE_PWD_/qmldir \
118- $$_PRO_FILE_PWD_/plugins.qmltypes
119-qmldir.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
120-
121-INSTALLS += target qmldir assets
122-
123-OTHER_FILES += \
124- qmldir \
125- plugins.qmltypes
126-
127
128=== removed file 'src/src.pro'
129--- src/src.pro 2013-04-20 12:49:46 +0000
130+++ src/src.pro 1970-01-01 00:00:00 +0000
131@@ -1,65 +0,0 @@
132-TARGET = kdekonsole
133-PLUGIN_IMPORT_PATH = org/kde/konsole
134-PLUGIN_ASSETS = $$PWD/../assets/*
135-
136-QT += widgets
137-
138-SOURCES += \
139- $$PWD/plugin.cpp \
140- $$PWD/Pty.cpp \
141- $$PWD/kptyprocess.cpp \
142- $$PWD/kptydevice.cpp \
143- $$PWD/kpty.cpp \
144- $$PWD/kprocess.cpp \
145- $$PWD/ShellCommand.cpp \
146- $$PWD/Vt102Emulation.cpp \
147- $$PWD/tools.cpp \
148- $$PWD/Session.cpp \
149- $$PWD/Screen.cpp \
150- $$PWD/KeyboardTranslator.cpp \
151- $$PWD/Emulation.cpp \
152- $$PWD/History.cpp \
153- $$PWD/BlockArray.cpp \
154- $$PWD/TerminalCharacterDecoder.cpp \
155- $$PWD/konsole_wcwidth.cpp \
156- $$PWD/ScreenWindow.cpp \
157- $$PWD/Filter.cpp \
158- $$PWD/ColorScheme.cpp \
159- $$PWD/TerminalDisplay.cpp \
160- $$PWD/ksession.cpp
161-
162-HEADERS += \
163- $$PWD/plugin.h \
164- $$PWD/Pty.h \
165- $$PWD/kptyprocess.h \
166- $$PWD/kptydevice.h \
167- $$PWD/kpty.h \
168- $$PWD/kpty_p.h \
169- $$PWD/kprocess.h \
170- $$PWD/ShellCommand.h \
171- $$PWD/Vt102Emulation.h \
172- $$PWD/tools.h \
173- $$PWD/Session.h \
174- $$PWD/Screen.h \
175- $$PWD/KeyboardTranslator.h \
176- $$PWD/Emulation.h \
177- $$PWD/Character.h \
178- $$PWD/History.h \
179- $$PWD/CharacterColor.h \
180- $$PWD/BlockArray.h \
181- $$PWD/TerminalCharacterDecoder.h \
182- $$PWD/konsole_wcwidth.h \
183- $$PWD/ScreenWindow.h \
184- $$PWD/DefaultTranslatorText.h \
185- $$PWD/LineFont.h \
186- $$PWD/Filter.h \
187- $$PWD/ExtendedDefaultTranslator.h \
188- $$PWD/ColorTables.h \
189- $$PWD/ColorScheme.h \
190- $$PWD/TerminalDisplay.h \
191- $$PWD/ksession.h
192-
193-MOC_DIR = $$PWD/../.moc
194-OBJECTS_DIR = $$PWD/../.obj
195-
196-include(../plugin.pri)

Subscribers

People subscribed via source and target branches