qplot

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

  1. trunk
  2. Merge into trunk
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
1=== added file '_make_ubuntu.sh'
2--- _make_ubuntu.sh 1970-01-01 00:00:00 +0000
3+++ _make_ubuntu.sh 2010-06-22 10:44:26 +0000
4@@ -0,0 +1,5 @@
5+#!/bin/sh
6+
7+qmake-qt4 qplot-ubuntu.pro
8+make
9+
10
11=== added file 'qplot-ubuntu.pro'
12--- qplot-ubuntu.pro 1970-01-01 00:00:00 +0000
13+++ qplot-ubuntu.pro 2010-06-22 10:44:26 +0000
14@@ -0,0 +1,34 @@
15+QT += svg
16+TARGET = qplot
17+TEMPLATE = app
18+
19+QWT = /usr/include/qwt-qt4/
20+
21+LIBS += -L$${QWT}/lib -lqwt-qt4
22+
23+INCLUDEPATH += \
24+ $${QWT} \
25+ src \
26+ libs libs/clib
27+
28+SOURCES += \
29+ libs/clib/str.c \
30+ libs/clib/ini.c \
31+ src/plot_area.cpp \
32+ src/plot_win.cpp \
33+ src/main.cpp
34+
35+HEADERS += \
36+ src/plot_area.h \
37+ src/plot_win.h
38+
39+FORMS += \
40+ ui/plot_win.ui
41+
42+RESOURCES +=
43+
44+OBJECTS_DIR = .build/obj
45+MOC_DIR = .build/moc
46+RCC_DIR = .build/rcc
47+UI_DIR = .build/ui
48+

Subscribers

People subscribed via source and target branches

to all changes: