Merge lp:~eugeneai/qplot/trunk into lp:qplot

Proposed by Evgeny Cherkashin
Status: Merged
Merged at revision: 14
Proposed branch: lp:~eugeneai/qplot/trunk
Merge into: lp:qplot
Diff against target: 48 lines (+39/-0)
2 files modified
_make_ubuntu.sh (+5/-0)
qplot-ubuntu.pro (+34/-0)
To merge this branch: bzr merge lp:~eugeneai/qplot/trunk
Reviewer Review Type Date Requested Status
Alex Zorg Pending
Review via email: mp+28158@code.launchpad.net

Description of the change

Адаптировал процесс сборки для Убунты 10.4.

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added file '_make_ubuntu.sh'
--- _make_ubuntu.sh 1970-01-01 00:00:00 +0000
+++ _make_ubuntu.sh 2010-06-22 10:44:26 +0000
@@ -0,0 +1,5 @@
1#!/bin/sh
2
3qmake-qt4 qplot-ubuntu.pro
4make
5
06
=== added file 'qplot-ubuntu.pro'
--- qplot-ubuntu.pro 1970-01-01 00:00:00 +0000
+++ qplot-ubuntu.pro 2010-06-22 10:44:26 +0000
@@ -0,0 +1,34 @@
1QT += svg
2TARGET = qplot
3TEMPLATE = app
4
5QWT = /usr/include/qwt-qt4/
6
7LIBS += -L$${QWT}/lib -lqwt-qt4
8
9INCLUDEPATH += \
10 $${QWT} \
11 src \
12 libs libs/clib
13
14SOURCES += \
15 libs/clib/str.c \
16 libs/clib/ini.c \
17 src/plot_area.cpp \
18 src/plot_win.cpp \
19 src/main.cpp
20
21HEADERS += \
22 src/plot_area.h \
23 src/plot_win.h
24
25FORMS += \
26 ui/plot_win.ui
27
28RESOURCES +=
29
30OBJECTS_DIR = .build/obj
31MOC_DIR = .build/moc
32RCC_DIR = .build/rcc
33UI_DIR = .build/ui
34

Subscribers

People subscribed via source and target branches

to all changes: