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
=== modified file 'konsole-qml-plugin.pro'
--- konsole-qml-plugin.pro 2013-04-19 17:59:20 +0000
+++ konsole-qml-plugin.pro 2013-04-27 15:45:31 +0000
@@ -1,2 +1,94 @@
1TEMPLATE = subdirs1#########################################
2SUBDIRS += src2## CONFIGS
3#########################################
4
5TEMPLATE = lib
6CONFIG += qt plugin hide_symbols
7QT += qml quick widgets
8
9DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
10
11TARGET = kdekonsole
12PLUGIN_IMPORT_PATH = org/kde/konsole
13PLUGIN_ASSETS = $$PWD/assets/*
14
15#########################################
16## SOURCES
17#########################################
18
19SOURCES += \
20 $$PWD/src/plugin.cpp \
21 $$PWD/src/Pty.cpp \
22 $$PWD/src/kptyprocess.cpp \
23 $$PWD/src/kptydevice.cpp \
24 $$PWD/src/kpty.cpp \
25 $$PWD/src/kprocess.cpp \
26 $$PWD/src/ShellCommand.cpp \
27 $$PWD/src/Vt102Emulation.cpp \
28 $$PWD/src/tools.cpp \
29 $$PWD/src/Session.cpp \
30 $$PWD/src/Screen.cpp \
31 $$PWD/src/KeyboardTranslator.cpp \
32 $$PWD/src/Emulation.cpp \
33 $$PWD/src/History.cpp \
34 $$PWD/src/BlockArray.cpp \
35 $$PWD/src/TerminalCharacterDecoder.cpp \
36 $$PWD/src/konsole_wcwidth.cpp \
37 $$PWD/src/ScreenWindow.cpp \
38 $$PWD/src/Filter.cpp \
39 $$PWD/src/ColorScheme.cpp \
40 $$PWD/src/TerminalDisplay.cpp \
41 $$PWD/src/ksession.cpp
42
43HEADERS += \
44 $$PWD/src/plugin.h \
45 $$PWD/src/Pty.h \
46 $$PWD/src/kptyprocess.h \
47 $$PWD/src/kptydevice.h \
48 $$PWD/src/kpty.h \
49 $$PWD/src/kpty_p.h \
50 $$PWD/src/kprocess.h \
51 $$PWD/src/ShellCommand.h \
52 $$PWD/src/Vt102Emulation.h \
53 $$PWD/src/tools.h \
54 $$PWD/src/Session.h \
55 $$PWD/src/Screen.h \
56 $$PWD/src/KeyboardTranslator.h \
57 $$PWD/src/Emulation.h \
58 $$PWD/src/Character.h \
59 $$PWD/src/History.h \
60 $$PWD/src/CharacterColor.h \
61 $$PWD/src/BlockArray.h \
62 $$PWD/src/TerminalCharacterDecoder.h \
63 $$PWD/src/konsole_wcwidth.h \
64 $$PWD/src/ScreenWindow.h \
65 $$PWD/src/DefaultTranslatorText.h \
66 $$PWD/src/LineFont.h \
67 $$PWD/src/Filter.h \
68 $$PWD/src/ExtendedDefaultTranslator.h \
69 $$PWD/src/ColorTables.h \
70 $$PWD/src/ColorScheme.h \
71 $$PWD/src/TerminalDisplay.h \
72 $$PWD/src/ksession.h
73
74OTHER_FILES += \
75 $$PWD/src/qmldir \
76 $$PWD/src/plugins.qmltypes
77
78MOC_DIR = $$PWD/.moc
79OBJECTS_DIR = $$PWD/.obj
80
81#########################################
82## INTALLS
83#########################################
84
85target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
86
87assets.files += $$PLUGIN_ASSETS
88assets.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
89
90qmldir.files += $$PWD/src/qmldir \
91 $$PWD/src/plugins.qmltypes
92qmldir.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
93
94INSTALLS += target qmldir assets
395
=== removed file 'plugin.pri'
--- plugin.pri 2013-04-20 12:49:46 +0000
+++ plugin.pri 1970-01-01 00:00:00 +0000
@@ -1,21 +0,0 @@
1TEMPLATE = lib
2CONFIG += qt plugin hide_symbols
3QT += qml quick
4
5DEFINES += HAVE_POSIX_OPENPT HAVE_SYS_TIME_H HAVE_UPDWTMPX
6
7target.path = $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
8
9assets.files += $$PLUGIN_ASSETS
10assets.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
11
12qmldir.files += $$_PRO_FILE_PWD_/qmldir \
13 $$_PRO_FILE_PWD_/plugins.qmltypes
14qmldir.path += $$[QT_INSTALL_QML]/$$PLUGIN_IMPORT_PATH
15
16INSTALLS += target qmldir assets
17
18OTHER_FILES += \
19 qmldir \
20 plugins.qmltypes
21
220
=== removed file 'src/src.pro'
--- src/src.pro 2013-04-20 12:49:46 +0000
+++ src/src.pro 1970-01-01 00:00:00 +0000
@@ -1,65 +0,0 @@
1TARGET = kdekonsole
2PLUGIN_IMPORT_PATH = org/kde/konsole
3PLUGIN_ASSETS = $$PWD/../assets/*
4
5QT += widgets
6
7SOURCES += \
8 $$PWD/plugin.cpp \
9 $$PWD/Pty.cpp \
10 $$PWD/kptyprocess.cpp \
11 $$PWD/kptydevice.cpp \
12 $$PWD/kpty.cpp \
13 $$PWD/kprocess.cpp \
14 $$PWD/ShellCommand.cpp \
15 $$PWD/Vt102Emulation.cpp \
16 $$PWD/tools.cpp \
17 $$PWD/Session.cpp \
18 $$PWD/Screen.cpp \
19 $$PWD/KeyboardTranslator.cpp \
20 $$PWD/Emulation.cpp \
21 $$PWD/History.cpp \
22 $$PWD/BlockArray.cpp \
23 $$PWD/TerminalCharacterDecoder.cpp \
24 $$PWD/konsole_wcwidth.cpp \
25 $$PWD/ScreenWindow.cpp \
26 $$PWD/Filter.cpp \
27 $$PWD/ColorScheme.cpp \
28 $$PWD/TerminalDisplay.cpp \
29 $$PWD/ksession.cpp
30
31HEADERS += \
32 $$PWD/plugin.h \
33 $$PWD/Pty.h \
34 $$PWD/kptyprocess.h \
35 $$PWD/kptydevice.h \
36 $$PWD/kpty.h \
37 $$PWD/kpty_p.h \
38 $$PWD/kprocess.h \
39 $$PWD/ShellCommand.h \
40 $$PWD/Vt102Emulation.h \
41 $$PWD/tools.h \
42 $$PWD/Session.h \
43 $$PWD/Screen.h \
44 $$PWD/KeyboardTranslator.h \
45 $$PWD/Emulation.h \
46 $$PWD/Character.h \
47 $$PWD/History.h \
48 $$PWD/CharacterColor.h \
49 $$PWD/BlockArray.h \
50 $$PWD/TerminalCharacterDecoder.h \
51 $$PWD/konsole_wcwidth.h \
52 $$PWD/ScreenWindow.h \
53 $$PWD/DefaultTranslatorText.h \
54 $$PWD/LineFont.h \
55 $$PWD/Filter.h \
56 $$PWD/ExtendedDefaultTranslator.h \
57 $$PWD/ColorTables.h \
58 $$PWD/ColorScheme.h \
59 $$PWD/TerminalDisplay.h \
60 $$PWD/ksession.h
61
62MOC_DIR = $$PWD/../.moc
63OBJECTS_DIR = $$PWD/../.obj
64
65include(../plugin.pri)

Subscribers

People subscribed via source and target branches