# HG changeset patch # User John Kern # Date 1281657982 25200 # Node ID d9f0df25b6a30e8c4ca821a7faaa29a6ed20ddd5 # Parent adbe71832e2b1d150d7d3b0c6ffc3d526a089bf4 resolved merge diff -r adbe71832e2b -r d9f0df25b6a3 contactengine/.make.cache --- a/contactengine/.make.cache Thu Aug 12 10:49:23 2010 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ -# ============================================================================== -# This file is generated by make and should not be modified by the user -# Name : .make.cache -# Part of : contactengine -# Description : This file is used to cache last build target for -# make sis target. -# Version : -# -# ============================================================================== - -QT_SIS_TARGET ?= DEBUG-GCCE diff -r adbe71832e2b -r d9f0df25b6a3 contactengine/contactengine.pro --- a/contactengine/contactengine.pro Thu Aug 12 10:49:23 2010 -0700 +++ b/contactengine/contactengine.pro Thu Aug 12 17:06:22 2010 -0700 @@ -28,6 +28,9 @@ CONFIG += mobility MOBILITY = contacts +unix:INCLUDEPATH += /home/johnk/libs/include/QtContacts /home/johnk/libs/include/ +unix:LIBS += -L/home/johnk/libs/lib -lQtContacts + databasefiles.sources = contacts.csv databasefiles.path = . diff -r adbe71832e2b -r d9f0df25b6a3 contactengine/contactengine.pro.user --- a/contactengine/contactengine.pro.user Thu Aug 12 10:49:23 2010 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,432 +0,0 @@ - - - - ProjectExplorer.Project.ActiveTarget - 3 - - - ProjectExplorer.Project.EditorSettings - - System - - - - ProjectExplorer.Project.Target.0 - - Desktop - Qt4ProjectManager.Target.DesktopTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/workspace/QtExamples/contactengine-build-desktop - 33 - 2 - true - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-desktop - 33 - 2 - true - - 2 - - contactengine - Qt4ProjectManager.Qt4RunConfiguration - 2 - - contactengine.pro - false - false - - false - false - - - 1 - - - - ProjectExplorer.Project.Target.1 - - Qt Simulator - Qt4ProjectManager.Target.QtSimulatorTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/workspace/QtExamples/contactengine-build-simulator - 3 - 2 - true - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - 2 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-simulator - 3 - 2 - true - - 2 - - contactengine - Qt4ProjectManager.Qt4RunConfiguration - 2 - - contactengine.pro - false - false - - false - false - - - 1 - - - - ProjectExplorer.Project.Target.2 - - Remote compiler - Qt4ProjectManager.Target.WccCompilerTarget - 0 - 0 - - - - Qt4ProjectManager.WccBuildStep - - - - 2 - - 1 - 0 - false - - Maemo 5 - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-wcc - 12 - 12 - true - - - - - Qt4ProjectManager.WccBuildStep - - - - 2 - - 1 - 0 - false - - S60 3rd Edition Feature Pack 1 - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-wcc - 13 - 12 - true - - - - - Qt4ProjectManager.WccBuildStep - - - - 2 - - 1 - 0 - false - - S60 3rd Edition Feature Pack 2 - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-wcc - 14 - 12 - true - - - - - Qt4ProjectManager.WccBuildStep - - - - 2 - - 1 - 0 - false - - S60 5th Edition - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-wcc - 15 - 12 - true - - - - - Qt4ProjectManager.WccBuildStep - - - - 2 - - 1 - 0 - false - - S60 5th Edition (N97 SDK) - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine-build-wcc - 16 - 12 - true - - 5 - - Remote compiler - empty run configuration - Qt4ProjectManager.WccRunConfiguration - contactengine.pro - - 1 - - - - ProjectExplorer.Project.Target.3 - - Symbian Device - Qt4ProjectManager.Target.S60DeviceTarget - 0 - 0 - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - - Create SIS Package - Qt4ProjectManager.S60SignBuildStep - false - - - - - 0 - - 3 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Debug - Qt4ProjectManager.Qt4BuildConfiguration - 2 - C:/workspace/QtExamples/contactengine - 2 - 6 - false - - - - qmake - QtProjectManager.QMakeBuildStep - - - - Make - Qt4ProjectManager.MakeStep - false - - - - - Create SIS Package - Qt4ProjectManager.S60SignBuildStep - false - - - - - 0 - - 3 - - Make - Qt4ProjectManager.MakeStep - true - - clean - - - - 1 - false - - Release - Qt4ProjectManager.Qt4BuildConfiguration - 0 - C:/workspace/QtExamples/contactengine - 2 - 6 - false - - 2 - - contactengine on Symbian Device - Qt4ProjectManager.S60DeviceRunConfiguration - - contactengine.pro - COM3 - - 1 - - - - ProjectExplorer.Project.TargetCount - 4 - - - ProjectExplorer.Project.Updater.FileVersion - 4 - -