projects / jenirok / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fixed an error in settings dialog that caused app to segfault on arm. Changed init...
[jenirok] / src / gui / Makefile
diff --git a/src/gui/Makefile b/src/gui/Makefile
index 1ccf24e..fa3d397 100644 (file)
--- a/src/gui/Makefile
+++ b/src/gui/Makefile
@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: jenirok
-# Generated by qmake (2.01a) (Qt 4.6.2) on: Sat Apr 17 12:38:19 2010
+# Generated by qmake (2.01a) (Qt 4.6.2) on: Thu May 27 17:38:04 2010
 # Project:  gui.pro
 # Template: app
 # Command: /usr/bin/qmake -unix -o Makefile gui.pro
@@ -10,12 +10,12 @@
 
 CC            = gcc
 CXX           = g++
-DEFINES       = -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS        = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/conic -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS      = -pipe -O2 -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/conic -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH       = -I/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++ -I. -I/targets/FREMANTLE_X86/usr/include/QtCore -I/targets/FREMANTLE_X86/usr/include/QtNetwork -I/targets/FREMANTLE_X86/usr/include/QtGui -I/targets/FREMANTLE_X86/usr/include/QtSql -I/targets/FREMANTLE_X86/usr/include/QtMaemo5 -I/targets/FREMANTLE_X86/usr/include -I../common -I.
+DEFINES       = -DQT_GL_NO_SCISSOR_TEST -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024 -DDATADIR=\"/usr/share\" -DPKGDATADIR=\"\" -DQT_NO_DEBUG -DQT_MAEMO5_LIB -DQT_SQL_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS        = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/conic -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+CXXFLAGS      = -pipe -O3 -fno-omit-frame-pointer -fno-optimize-sibling-calls -I/usr/include/evolution-data-server-1.4 -I/usr/include/dbus-1.0 -I/usr/include/libxml2 -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/gconf/2 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -I/usr/include/conic -I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include -Wall -W -D_REENTRANT $(DEFINES)
+INCPATH       = -I/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5 -I. -I/targets/FREMANTLE_ARMEL/usr/include/QtCore -I/targets/FREMANTLE_ARMEL/usr/include/QtNetwork -I/targets/FREMANTLE_ARMEL/usr/include/QtGui -I/targets/FREMANTLE_ARMEL/usr/include/QtSql -I/targets/FREMANTLE_ARMEL/usr/include/QtMaemo5 -I/targets/FREMANTLE_ARMEL/usr/include -I../common -I.
 LINK          = g++
-LFLAGS        = -Wl,-O1 -Wl,-rpath,/usr/lib
+LFLAGS        = -Wl,-rpath-link,/usr/lib -Wl,-O1 -Wl,--hash-style=gnu -Wl,-rpath,/usr/lib
 LIBS          = $(SUBLIBS)  -L/usr/lib -lebook-1.2 -ledataserver-1.2 -lxml2 -lgconf-2 -ldbus-glib-1 -lconic -ldbus-1 -lgobject-2.0 -lglib-2.0 -lQtMaemo5 -L/usr/lib -L/usr/X11R6/lib -lQtSql -lQtGui -lQtNetwork -lQtDBus -lQtXml -lQtCore -lpthread 
 AR            = ar cqs
 RANLIB        = 
@@ -55,7 +55,8 @@ SOURCES       = main.cpp \
                ../common/contactmanager.cpp \
                ../common/db.cpp \
                ../common/settings.cpp \
-               ../common/connectionmanager.cpp moc_mainwindow.cpp \
+               ../common/connectionmanager.cpp \
+               ../common/cache.cpp moc_mainwindow.cpp \
                moc_searchdialog.cpp \
                moc_resultwindow.cpp \
                moc_detailwindow.cpp \
@@ -77,6 +78,7 @@ OBJECTS       = main.o \
                db.o \
                settings.o \
                connectionmanager.o \
+               cache.o \
                moc_mainwindow.o \
                moc_searchdialog.o \
                moc_resultwindow.o \
@@ -86,26 +88,25 @@ OBJECTS       = main.o \
                moc_connectionmanager.o \
                qrc_icons.o \
                qrc_translations.o
-DIST          = /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST          = /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                gui.pro
 QMAKE_TARGET  = jenirok
 DESTDIR       = 
@@ -138,26 +139,25 @@ all: Makefile $(TARGET)
 $(TARGET):  $(OBJECTS)  
        $(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
 
-Makefile: gui.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.conf /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf \
-               /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf \
+Makefile: gui.pro  /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/linux-g++-maemo5/qmake.conf /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf \
+               /targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf \
                /usr/lib/libQtMaemo5.prl \
                /usr/lib/libQtDBus.prl \
                /usr/lib/libQtXml.prl \
@@ -166,26 +166,25 @@ Makefile: gui.pro  /targets/FREMANTLE_X86/usr/share/qt4/mkspecs/linux-g++/qmake.
                /usr/lib/libQtSql.prl \
                /usr/lib/libQtNetwork.prl
        $(QMAKE) -unix -o Makefile gui.pro
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/g++.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/unix.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/common/linux.conf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/qconfig.pri:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt_config.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_pre.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/release.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/default_post.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/warn_on.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/qt.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/moc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/resources.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/uic.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/yacc.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/lex.prf:
-/targets/FREMANTLE_X86/usr/share/qt4/mkspecs/features/include_source_dir.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/unix.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/common/linux.conf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/qconfig.pri:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_functions.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt_config.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_pre.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/release.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/default_post.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/warn_on.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/qt.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/unix/thread.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/moc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/resources.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/uic.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/yacc.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/lex.prf:
+/targets/FREMANTLE_ARMEL/usr/share/qt4/mkspecs/features/include_source_dir.prf:
 /usr/lib/libQtMaemo5.prl:
 /usr/lib/libQtDBus.prl:
 /usr/lib/libQtXml.prl:
@@ -198,7 +197,7 @@ qmake:  FORCE
 
 dist: 
        @$(CHK_DIR_EXISTS) .tmp/jenirok1.0.0 || $(MKDIR) .tmp/jenirok1.0.0 
-       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents icons.grc ../common/translations.grc .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirok1.0.0/ && (cd `dirname .tmp/jenirok1.0.0` && $(TAR) jenirok1.0.0.tar jenirok1.0.0 && $(COMPRESS) jenirok1.0.0.tar) && $(MOVE) `dirname .tmp/jenirok1.0.0`/jenirok1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirok1.0.0
+       $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents mainwindow.h searchdialog.h resultwindow.h detailwindow.h settingsdialog.h buttonselector.h daemon.h ../common/eniro.h ../common/contactmanager.h ../common/db.h ../common/settings.h ../common/connectionmanager.h ../common/cache.h .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents icons.grc ../common/translations.grc .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents main.cpp mainwindow.cpp searchdialog.cpp resultwindow.cpp detailwindow.cpp settingsdialog.cpp buttonselector.cpp daemon.cpp ../common/eniro.cpp ../common/contactmanager.cpp ../common/db.cpp ../common/settings.cpp ../common/connectionmanager.cpp ../common/cache.cpp .tmp/jenirok1.0.0/ && $(COPY_FILE) --parents ../common/translations/fi_FI.ts .tmp/jenirok1.0.0/ && (cd `dirname .tmp/jenirok1.0.0` && $(TAR) jenirok1.0.0.tar jenirok1.0.0 && $(COMPRESS) jenirok1.0.0.tar) && $(MOVE) `dirname .tmp/jenirok1.0.0`/jenirok1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/jenirok1.0.0
 
 
 clean:compiler_clean 
@@ -335,6 +334,12 @@ settings.o: ../common/settings.cpp ../common/settings.h \
 connectionmanager.o: ../common/connectionmanager.cpp ../common/connectionmanager.h
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o connectionmanager.o ../common/connectionmanager.cpp
 
+cache.o: ../common/cache.cpp ../common/cache.h \
+               ../common/eniro.h \
+               ../common/db.h \
+               ../common/settings.h
+       $(CXX) -c $(CXXFLAGS) $(INCPATH) -o cache.o ../common/cache.cpp
+
 moc_mainwindow.o: moc_mainwindow.cpp 
        $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_mainwindow.o moc_mainwindow.cpp
 
Unnamed repository; edit this file to name it for gitweb.