$(foreach target,$(TARGETS),$(eval $(call GENERIC_RULES_TEMPLATE,$(target))))
-build_libs: checkpackages
+build_libs:
@$(MAKE) PC_TARGET=yes USE_ARDRONE_TOOL=no TARGET=pc_ USE_MINGW32=no -C ../Lib/Build $(MAKECMDGOALS)
ifeq ("$(MINGW32_MODE)","yes")
#include <VLIB/video_huffman.h>
+#ifndef NULL
+#define NULL 0
+#endif
+
+
/// Macroblock type & Coded Block Pattern for Chrominance (MCBPC)
#include "p263_layers.h"
#include "p263_huffman.h"
+
+
p263_mb_type_t standard_mb_types[STANDARD_MB_TYPES_NUM] = {
MAKE_MB_TYPE( 1, 1, 1, 0, 1, 0 ), // INTER
MAKE_MB_TYPE( 1, 1, 1, 1, 1, 0 ), // INTER+Q
#if TARGET_CPU_X86 == 1
-#include <intrin.h>
+#include <VP_Os/linux/intrin.h>
#include "video_utils_x86.h"
{
bool_t got_image;
- vp_os_mutex_lock( &out->lock );
+ //vp_os_mutex_lock( &out->lock );
if(out->status == VP_API_STATUS_INIT)
{
}
}
- vp_os_mutex_unlock( &out->lock );
+ // vp_os_mutex_unlock( &out->lock );
return C_OK;
}
#ifndef _VIDEO_CONTROLLER_H_
#define _VIDEO_CONTROLLER_H_
+//#include <vlib_types.h>
+#include <stdint.h>
#include <VP_Os/vp_os_types.h>
-#include <VP_Api/vp_api_picture.h>
-
#include <VLIB/video_picture.h>
#include <VLIB/video_gob.h>
INTERNAL_LOG_FILE=build.log
-ifdef PARROTOS_MAKEFILE
- TWEAKED_PARROTOS_MAKEFILE=$(GENERIC_LIBRARY_TARGET_DIR)/tweaked_parrotos.mak
- include $(TWEAKED_PARROTOS_MAKEFILE)
- GENERIC_LIBRARY_SOURCE_FILES=$(filter-out mDNSPosix/Responder.c,$(CFILES:P5_FFT.c=P5_FFT.s) $(SFILES) $(PSFILES))
- GENERIC_INCLUDES+=$(patsubst %,-I$(GENERIC_LIBRARY_SOURCE_DIR)/%,$(MODULES))
-endif
-
-ifeq ($(QUIET_BUILD),yes)
- Q=@
- SILENT=2>&1 > /dev/null
-endif
-
-ifeq ($(USE_NDS),yes)
- NDS_CPU_TYPE=$(shell echo $(NDS_CPU) | tr "A-Z" "a-z" | sed -e "s@[0-9][0-9]*@@")
- NDS_CPU_NUM=$(shell echo $(NDS_CPU) | sed -e "s@[a-zA-Z][a-zA-Z]*@@")
- INTERNAL_NDSTOOL:=$(Q)ndstool
- INTERNAL_DSBUILD:=$(Q)dsbuild
-endif
INTERNAL_SOURCE_EXTENSIONS= .c .S .s .cpp
INTERNAL_TARGET_BINARIES:=$(patsubst %.c,%,$(GENERIC_BINARIES_SOURCE_ENTRYPOINTS))
INTERNAL_TARGET_BINARIES:=$(patsubst %,$(GENERIC_TARGET_BINARIES_DIR)/$(GENERIC_TARGET_BINARIES_PREFIX)%,$(INTERNAL_TARGET_BINARIES))
-_INTERNAL_LIBRARY_DEPFILES:=$(foreach ext,$(INTERNAL_SOURCE_EXTENSIONS),\
- $(patsubst $(GENERIC_LIBRARY_SOURCE_DIR)/%$(ext),$(GENERIC_LIBRARY_TARGET_DIR)/%$(ext).d,$(filter %$(ext),$(INTERNAL_LIBRARY_SOURCE_FILES))))
-_INTERNAL_BINARIES_DEPFILES:=$(foreach ext,$(INTERNAL_SOURCE_EXTENSIONS),\
- $(patsubst $(GENERIC_BINARIES_SOURCE_DIR)/%$(ext),$(GENERIC_BINARIES_TARGET_DIR)/%$(ext).d,$(filter %$(ext),$(INTERNAL_BINARIES_COMMON_SOURCE_FILES))))
-_INTERNAL_BINARIES_DEPFILES+=$(foreach ext,$(INTERNAL_SOURCE_EXTENSIONS),\
- $(patsubst %$(ext),$(GENERIC_BINARIES_TARGET_DIR)/%$(ext).d,$(filter %$(ext),$(GENERIC_BINARIES_SOURCE_ENTRYPOINTS))))
-
-ifneq ($(MAKECMDGOALS),clean)
- INTERNAL_LIBRARY_DEPFILES:=$(_INTERNAL_LIBRARY_DEPFILES)
- INTERNAL_BINARIES_DEPFILES:=$(_INTERNAL_BINARIES_DEPFILES)
-endif
ALL_TO_BE_DONE= \
- $(INTERNAL_LIBRARY_DEPFILES) \
- $(INTERNAL_BINARIES_DEPFILES) \
$(INTERNAL_LIBRARY_TARGET_OFILES) \
$(GENERIC_TARGET_LIBRARY) \
$(INTERNAL_BINARIES_COMMON_TARGET_OFILES) \
$(INTERNAL_BINARIES_TARGET_OENTRYPOINTS) \
$(INTERNAL_TARGET_BINARIES)
-ifeq ($(GENERIC_TARGET_LIBRARY),)
-ifeq ($(USE_DLL),yes)
- ALL_TO_BE_DONE+=$(GENERIC_TARGET_BINARIES_DIR)/$(GENERIC_TARGET_BINARIES_PREFIX)$(DLL_ID).dll
-endif
-endif
CREATE_TARGET_DIRECTORY=$(INTERNAL_MKDIR) $(@D)
update:
-$(TWEAKED_PARROTOS_MAKEFILE): $(PARROTOS_MAKEFILE)
- @$(CREATE_TARGET_DIRECTORY)
- @echo "all:" >> $(TWEAKED_PARROTOS_MAKEFILE)
- @cat $(PARROTOS_MAKEFILE) | grep -v "^[-]*include" | grep -v "^all:" | sed -e "s@^\([A-Z]*[=]*\)\([ \t]*\)\(/\)@\1\2@" | sed -e "s@^clean:@NOCLEAN:@" >> $(TWEAKED_PARROTOS_MAKEFILE)
-
-ifneq ("$(INTERNAL_LIBRARY_TARGET_OFILES)","")
$(GENERIC_TARGET_LIBRARY): $(INTERNAL_LIBRARY_TARGET_OFILES)
@$(CREATE_TARGET_DIRECTORY)
@$(INTERNAL_ECHO) "ar $(GENERIC_ARFLAGS)" $(subst $(GENERIC_LIBRARY_TARGET_DIR)/,,$@ $^)
@$(INTERNAL_AR) $(GENERIC_ARFLAGS) $@ $^
endif
-ifeq ($(USE_DLL),yes)
-$(GENERIC_TARGET_BINARIES_DIR)/$(GENERIC_TARGET_BINARIES_PREFIX)$(DLL_ID).dll: $(INTERNAL_BINARIES_COMMON_TARGET_OFILES) $(GENERIC_ADD_OFILES) $(GENERIC_BINARIES_LIBS_DEPS)
-else
-$(GENERIC_TARGET_BINARIES_DIR)/$(GENERIC_TARGET_BINARIES_PREFIX)%: $(GENERIC_BINARIES_TARGET_DIR)/%.o $(INTERNAL_BINARIES_COMMON_TARGET_OFILES) $(GENERIC_ADD_OFILES) $(GENERIC_BINARIES_LIBS_DEPS)
-endif
- @$(CREATE_TARGET_DIRECTORY)
- ifeq ($(QUIET_BUILD),yes)
- ifeq ($(USE_NDS),yes)
- @$(INTERNAL_ECHO) "dsbuild $(GENERIC_TARGET_BINARIES_PREFIX)$*.nds"
- else
- ifeq ($(USE_DLL),yes)
- @$(INTERNAL_ECHO) "ld $(GENERIC_TARGET_BINARIES_PREFIX)$(DLL_ID).dll"
- else
- @$(INTERNAL_ECHO) "ld $(GENERIC_TARGET_BINARIES_PREFIX)$*"
- endif
- endif
- endif
- ifeq ($(USE_DLL),yes)
- $(GENERIC_COMMAND_PREFIX)dlltool -e $(GENERIC_TARGET_BINARIES_DIR)/$(DLL_ID)_exports.o --export-all-symbols -l $(@:.dll=.lib) $(INTERNAL_BINARIES_COMMON_TARGET_OFILES)
- $(INTERNAL_CC) --shared -o $@ $(INTERNAL_BINARIES_COMMON_TARGET_OFILES) $(GENERIC_TARGET_BINARIES_DIR)/$(DLL_ID)_exports.o $(GENERIC_ADD_OFILES) $(GENERIC_LIB_PATHS) $(GENERIC_LIBS) $(GENERIC_LDFLAGS) $(LDFLAGS_$(subst /,_,$*))
- $(RM) $(GENERIC_TARGET_BINARIES_DIR)/$(DLL_ID)_exports.o
- else
- $(INTERNAL_CC) -o $@ $(GENERIC_BINARIES_TARGET_DIR)/$*.o $(INTERNAL_BINARIES_COMMON_TARGET_OFILES) $(GENERIC_ADD_OFILES) $(GENERIC_LIB_PATHS) $(GENERIC_LIBS) $(GENERIC_LDFLAGS) $(LDFLAGS_$(subst /,_,$*))
- endif
- ifeq ($(RELEASE_BUILD),yes)
- cp $@ $(shell dirname $@)/sym_$(shell basename $@)
- $(INTERNAL_STRIP) $@
- endif
- ifeq ($(USE_NDS),yes)
- $(INTERNAL_OBJCOPY) -O binary $@ $@.$(NDS_CPU_TYPE)$(NDS_CPU_NUM)
- $(INTERNAL_NDSTOOL) -c $@.nds -$(NDS_CPU_NUM) $@.$(NDS_CPU_TYPE)$(NDS_CPU_NUM) $(SILENT)
- $(INTERNAL_DSBUILD) $@.nds $(SILENT)
- endif
-
# Template build rules
# first param $(1) : rule type (LIBRARY or BINARIES)
# second param $(2) : source extension (.c for example)
# Date : 2008/10/30
#
###########################################################################################
+USE_ANDROID = no
+USE_IPHONE= no
+USE_NDK = no
+USE_ELINUX= no
+USE_LINUX = no
+USE_BLUEZ = no
+USE_APP = no
+USE_SDK = no
+
+
+IPHONE_MODE = no
+MINGW32_MODE = no
+USE_NDS = no
+USE_ANDROID = no
+USE_LINUX = yes
+FF_ARC = Intel
include common.makefile
UVLC/uvlc_mb_layer.c \
UVLC/uvlc_picture_layer.c
-ifeq ($(USE_ELINUX),yes)
-GENERIC_LIBRARY_SOURCE_FILES+= \
- Platform/arm9_P6/video_utils.c \
- Platform/arm9_P6/video_dct_p6.c \
- Platform/arm9_P6/video_p264_p6.c \
- Platform/arm9_P6/video_quantizer_p6.c \
- Platform/arm9_P6/video_packetizer_p6.S \
- Platform/arm9_P6/UVLC/uvlc_p6.S \
- Platform/arm9_P6/UVLC/uvlc_mb_layer_p6.S
-endif
-
-ifeq ($(USE_IPHONE),yes)
- ifeq ($(IPHONE_PLATFORM),iphoneos)
- GENERIC_LIBRARY_SOURCE_FILES+= \
- Platform/arm11/video_utils.c \
- Platform/arm11/UVLC/uvlc_codec.c
- else
- GENERIC_LIBRARY_SOURCE_FILES+= \
- Platform/x86/video_utils.c \
- Platform/x86/UVLC/uvlc_codec.c
- endif
-else
- ifeq ($(USE_ANDROID),yes)
- GENERIC_LIBRARY_SOURCE_FILES+= \
- Platform/arm11/video_utils.c \
- Platform/arm11/UVLC/uvlc_codec.c
- else
- ifeq ($(TARGET_CPU_ARM),1)
- GENERIC_LIBRARY_SOURCE_FILES+= \
- Platform/arm11/video_utils.c \
- Platform/arm11/UVLC/uvlc_codec.c
- else
- ifeq ($(FF_ARCH),Intel)
- GENERIC_LIBRARY_SOURCE_FILES+= \
Platform/x86/video_utils.c \
Platform/x86/UVLC/uvlc_codec.c
- endif
- endif
- endif
-endif
GENERIC_LIBRARY_SOURCE_DIR=$(VLIB_SOURCE_DIR)
#ifndef _VP_API_INCLUDE_H_
#define _VP_API_INCLUDE_H_
-#include <VP_Os/vp_os_signal.h>
+//#include <VP_Os/vp_os_signal.h>
#include <VP_Os/vp_os_types.h>
#include <VP_Api/vp_api_config.h>
#include <VP_Api/vp_api_stage.h>
// INCLUDES
#include <VP_Os/vp_os_types.h>
-#include <VP_Os/vp_os_signal.h>
+//#include <VP_Os/vp_os_signal.h>
+typedef int vp_os_mutex_t ;
///////////////////////////////////////////////
// GLOBALS
#ifndef _VP_SDK_TYPES_H_
#define _VP_SDK_TYPES_H_
+#include <stdint.h>
#include <VP_Os/vp_os.h>
#if defined(USE_LINUX) || defined(__ELINUX__)
all:lib
-lib:ARDroneLib/Soft/Build/Makefile FORCE
- cd ARDroneLib/Soft/Build && make
+lib:ARDroneLib/VLIB/Makefile
+ cd ARDroneLib/VLIB && make
-clean:ARDroneLib/Soft/Build/Makefile
- cd ARDroneLib/Soft/Build && make clean
+clean:ARDroneLib/VLIB/Makefile
+ cd ARDroneLib/VLIB && make clean
-FORCE:
-
Component.onCompleted: {
console.debug("Appending items to choices",uiList.count())
for(var j = 0; j < uiList.count();++j ) {
- var data = {'name':uiList.get(j).name,'file':uiList.get(j).file };
+ var data = {'name':uiList.get(j).name,'modelData':uiList.get(j).name,'file':uiList.get(j).file };
// var data = {'name':uiList.get(j).name };
console.debug("appending ",uiList.get(j).name,uiList.get(j).file);
choices.append(data);
- if(uiList.get(j).file==drone.confActiveUI) activeUIDialog.selectedIndex=j;
+ if(uiList.get(j).file==drone.confActiveUI) { activeUIDialog.selectedIndex=j; uiDialogButton.text=uiList.get(j).name }
}
}
ListModel {
id: choices
- ListElement {
- name:"none";
- file:"none.qml"
- }
+ /* ListElement {name:"xyzzy" ;file:"plugh.qml"}
+ ListElement {name:"xyzzy2" ;file:"plugh.qml"}*/
}
SelectionDialog {
id: activeUIDialog;
+ height:400
model:choices
onSelectedIndexChanged: {
- console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
- drone.confActiveUI=choices.get(selectedIndex).file
- }
+ console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
+ drone.confActiveUI=choices.get(selectedIndex).file;
+ uiDialogButton.text=uiList.get(selectedIndex).name
+ }
}
Flickable {
}
Button {
- text:drone.confActiveUI
+ id:uiDialogButton
+ text:""
anchors.right:parent.right
onClicked: {
// activeUIDialog.setSelectedIndex(text);
id: useJoySw
checked:drone.confUseJoyStick
anchors.right:parent.right
- enabled:js.haveJoyStick
+ // enabled:js.haveJoyStick
onCheckedChanged:{drone.confUseJoyStick=checked;}
}
Text {
text: "Show engine gauges"
- color:textColor
+ color:textColor
font.pixelSize :textSize
}
property int textSize:30
id:calibrateDialog
tools:commonTools
- Component.onCompleted: {
- if (calibrateDialog.status != Component.Ready)
- console.log("Error loading component:", calibrateDialog.errorString());
- }
JoyStickCalibrator {
id:jc
Component.onCompleted: {
for(var j = 0; j < uiList.count();++j ) {
- var data = {'name':uiList.get(j).name,'file':uiList.get(j).file };
+ var data = {'text':uiList.get(j).name,'name':uiList.get(j).name,'file':uiList.get(j).file };
// var data = {'name':uiList.get(j).name };
console.debug("appending ",uiList.get(j).name,uiList.get(j).file);
choices.append(data);
ListModel {
id: choices
- ListElement { text: "MeeGo/Harmattan";file:"ardrone_harmattan.qml" }
- ListElement { text: "Symbian";file:"ardrone_symbian.qml" }
- ListElement { text: "Desktop";file:"ardrone_desktop.qml" }
}
ComboBox {
id: activeUICombo;
width:200
- model:uiList
+ model:choices
onSelectedIndexChanged: {
console.debug("onSelectedIndexChanged " + selectedText + ", " + model.get(selectedIndex).file);
drone.confActiveUI=model.get(selectedIndex).file
MenuItem { text:"Desktop"; onClicked: { drone.confActiveUI="ardrone_desktop.qml"}}
}
}
-
Component.onCompleted: {
- for(var j = 0; j < uiList.length;++j ) {
- var data = {'name':uiList[j].name,'modelData':uiList[j].name,'file':uiList[j].file };
- console.debug("appending ",uiList.get(j).name,uiList.get(j).file)
+ console.debug("Appending items to choices",uiList.count())
+ for(var j = 0; j < uiList.count();++j ) {
+ var data = {'name':uiList.get(j).name,'modelData':uiList.get(j).name,'file':uiList.get(j).file };
+ console.debug("appending ",uiList.get(j).name,uiList.get(j).file);
choices.append(data);
- if(uIList[j].file==drone.confActiveUI) activeUIDialog.selectedIndex=j;
+ if(uiList.get(j).file==drone.confActiveUI) { activeUIDialog.selectedIndex=j; uiDialogButton.text=uiList.get(j).name }
}
}
ListModel {
id: choices
- ListElement {
- name:"none";
- modelData:"none"
- file:"none"
- }
}
SelectionDialog {
id: activeUIDialog;
- model:uiList
+ model:choices
onSelectedIndexChanged: {
- console.debug("onSelectedIndexChanged " +selectedIndex);
- console.debug("onSelectedIndexChanged " +uiList.get(selectedIndex).name);
- console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
- drone.confActiveUI=choices.get(selectedIndex).file
- }
-
+ console.debug("onSelectedIndexChanged " + model.get(selectedIndex).name + ", " + model.get(selectedIndex).file);
+ drone.confActiveUI=choices.get(selectedIndex).file;
+ uiDialogButton.text=uiList.get(selectedIndex).name
+ }
}
Flickable {
id: dialogscrolarea
}
Button {
width:200
- text:drone.confActiveUI
+ id:uiDialogButton
+ text:""
anchors.right:parent.right
onClicked:activeUIDialog.open()
// onClicked:uiMenu.open()
#############################################################################
-# Makefile for building: mardrone
-# Generated by qmake (2.01a) (Qt 4.7.4) on: Wed Jan 25 14:08:11 2012
+# Makefile for building: mardrone.app/Contents/MacOS/mardrone
+# Generated by qmake (2.01a) (Qt 4.8.0) on: Tue May 8 18:18:49 2012
# Project: mardrone.pro
# Template: app
-# Command: /usr/bin/qmake-qt4 -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
+# Command: /usr/bin/qmake -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
#############################################################################
####### Compiler, tools and options
CC = gcc
CXX = g++
-DEFINES = -DQT_WEBKIT -DHAVE_SDL -DQT_NO_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
-CFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-CXXFLAGS = -pipe -O2 -Wall -W -D_REENTRANT $(DEFINES)
-INCPATH = -I/usr/share/qt4/mkspecs/linux-g++ -I. -I/usr/include/qt4/QtCore -I/usr/include/qt4/QtNetwork -I/usr/include/qt4/QtGui -I/usr/include/qt4/QtDeclarative -I/usr/include/qt4 -Idronelib -Igauges -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Common -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os/linux -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Lib -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VLIB -IARDrone_SDK_Version_1_8_20110726/ARDroneLib -I.
+DEFINES = -DHAVE_SDL -DQT_DECLARATIVE_DEBUG -DQT_DECLARATIVE_LIB -DQT_GUI_LIB -DQT_NETWORK_LIB -DQT_CORE_LIB -DQT_SHARED
+CFLAGS = -pipe -g -gdwarf-2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5 -Wall -W $(DEFINES)
+CXXFLAGS = -pipe -g -gdwarf-2 -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5 -Wall -W $(DEFINES)
+INCPATH = -I/usr/local/Qt4.8/mkspecs/macx-g++ -I. -I/Library/Frameworks/QtCore.framework/Versions/4/Headers -I/usr/include/QtCore -I/Library/Frameworks/QtNetwork.framework/Versions/4/Headers -I/usr/include/QtNetwork -I/Library/Frameworks/QtGui.framework/Versions/4/Headers -I/usr/include/QtGui -I/Library/Frameworks/QtDeclarative.framework/Versions/4/Headers -I/usr/include/QtDeclarative -I/usr/include -Idronelib -Igauges -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Common -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os/linux -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VP_SDK/VP_Os -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/Soft/Lib -IARDrone_SDK_Version_1_8_20110726/ARDroneLib/VLIB -IARDrone_SDK_Version_1_8_20110726/ARDroneLib -I. -F/Library/Frameworks
LINK = g++
-LFLAGS = -Wl,-O1
-LIBS = $(SUBLIBS) -L/usr/lib/i386-linux-gnu -lSDL -lQtDeclarative -lQtGui -lQtNetwork -lQtCore -lpthread
-AR = ar cqs
-RANLIB =
-QMAKE = /usr/bin/qmake-qt4
+LFLAGS = -headerpad_max_install_names -arch x86_64 -Xarch_x86_64 -mmacosx-version-min=10.5
+LIBS = $(SUBLIBS) -F/Library/Frameworks -L/Library/Frameworks -L../mardrone/ardrone-lib-osx -lvlib -framework SDL -framework QtDeclarative -framework QtScript -framework QtCore -framework QtSvg -framework QtGui -framework QtSql -framework QtXmlPatterns -framework QtNetwork
+AR = ar cq
+RANLIB = ranlib -s
+QMAKE = /usr/bin/qmake
TAR = tar -cf
COMPRESS = gzip -9f
COPY = cp -f
SED = sed
-COPY_FILE = $(COPY)
-COPY_DIR = $(COPY) -r
-STRIP = strip
-INSTALL_FILE = install -m 644 -p
+COPY_FILE = cp -f
+COPY_DIR = cp -f -R
+STRIP =
+INSTALL_FILE = $(COPY_FILE)
INSTALL_DIR = $(COPY_DIR)
-INSTALL_PROGRAM = install -m 755 -p
+INSTALL_PROGRAM = $(COPY_FILE)
DEL_FILE = rm -f
SYMLINK = ln -f -s
DEL_DIR = rmdir
MOVE = mv -f
CHK_DIR_EXISTS= test -d
MKDIR = mkdir -p
+export MACOSX_DEPLOYMENT_TARGET = 10.4
####### Output directory
gauges/gaugetape.cpp \
gauges/gaugehorizon.cpp \
dronelib/joystick.cpp \
- qdeclarativetoucharea.cpp moc_dronecontrol.cpp \
+ qdeclarativetoucharea.cpp \
+ gauges/gaugearc.cpp \
+ uilistelement.cpp \
+ gauges/gaugehsi.cpp moc_dronecontrol.cpp \
moc_navdata.cpp \
moc_video.cpp \
moc_gauge.cpp \
moc_gaugehorizon.cpp \
moc_joystick.cpp \
moc_qdeclarativetoucharea.cpp \
+ moc_gaugearc.cpp \
+ moc_uilistelement.cpp \
+ moc_gaugehsi.cpp \
qrc_ardrone.cpp
OBJECTS = main.o \
dronecontrol.o \
gaugehorizon.o \
joystick.o \
qdeclarativetoucharea.o \
+ gaugearc.o \
+ uilistelement.o \
+ gaugehsi.o \
moc_dronecontrol.o \
moc_navdata.o \
moc_video.o \
moc_gaugehorizon.o \
moc_joystick.o \
moc_qdeclarativetoucharea.o \
+ moc_gaugearc.o \
+ moc_uilistelement.o \
+ moc_gaugehsi.o \
qrc_ardrone.o
-DIST = /usr/share/qt4/mkspecs/common/g++.conf \
- /usr/share/qt4/mkspecs/common/unix.conf \
- /usr/share/qt4/mkspecs/common/linux.conf \
- /usr/share/qt4/mkspecs/qconfig.pri \
- /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
- /usr/share/qt4/mkspecs/features/qt_functions.prf \
- /usr/share/qt4/mkspecs/features/qt_config.prf \
- /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/release.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
+DIST = /usr/local/Qt4.8/mkspecs/common/unix.conf \
+ /usr/local/Qt4.8/mkspecs/common/mac.conf \
+ /usr/local/Qt4.8/mkspecs/common/gcc-base.conf \
+ /usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf \
+ /usr/local/Qt4.8/mkspecs/common/g++-base.conf \
+ /usr/local/Qt4.8/mkspecs/common/g++-macx.conf \
+ /usr/local/Qt4.8/mkspecs/qconfig.pri \
+ /usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri \
+ /usr/local/Qt4.8/mkspecs/features/qt_functions.prf \
+ /usr/local/Qt4.8/mkspecs/features/qt_config.prf \
+ /usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf \
+ /usr/local/Qt4.8/mkspecs/features/default_pre.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf \
+ deploy.pri \
+ /usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf \
+ /usr/local/Qt4.8/mkspecs/features/debug.prf \
+ /usr/local/Qt4.8/mkspecs/features/default_post.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/default_post.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf \
+ /usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf \
+ /usr/local/Qt4.8/mkspecs/features/declarative_debug.prf \
+ /usr/local/Qt4.8/mkspecs/features/warn_on.prf \
+ /usr/local/Qt4.8/mkspecs/features/qt.prf \
+ /usr/local/Qt4.8/mkspecs/features/unix/thread.prf \
+ /usr/local/Qt4.8/mkspecs/features/moc.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/rez.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/sdk.prf \
+ /usr/local/Qt4.8/mkspecs/features/resources.prf \
+ /usr/local/Qt4.8/mkspecs/features/uic.prf \
+ /usr/local/Qt4.8/mkspecs/features/yacc.prf \
+ /usr/local/Qt4.8/mkspecs/features/lex.prf \
+ /usr/local/Qt4.8/mkspecs/features/include_source_dir.prf \
mardrone.pro
QMAKE_TARGET = mardrone
DESTDIR =
-TARGET = mardrone
+TARGET = mardrone.app/Contents/MacOS/mardrone
+
+####### Custom Compiler Variables
+QMAKE_COMP_QMAKE_OBJECTIVE_CFLAGS = -pipe \
+ -g \
+ -arch \
+ x86_64 \
+ -Xarch_x86_64 \
+ -mmacosx-version-min=10.5 \
+ -Wall \
+ -W
+
first: all
####### Implicit rules
####### Build rules
-all: Makefile $(TARGET)
+all: Makefile mardrone.app/Contents/PkgInfo mardrone.app/Contents/Resources/empty.lproj mardrone.app/Contents/Info.plist $(TARGET)
$(TARGET): $(OBJECTS)
+ @$(CHK_DIR_EXISTS) mardrone.app/Contents/MacOS/ || $(MKDIR) mardrone.app/Contents/MacOS/
$(LINK) $(LFLAGS) -o $(TARGET) $(OBJECTS) $(OBJCOMP) $(LIBS)
-Makefile: mardrone.pro /usr/share/qt4/mkspecs/linux-g++/qmake.conf /usr/share/qt4/mkspecs/common/g++.conf \
- /usr/share/qt4/mkspecs/common/unix.conf \
- /usr/share/qt4/mkspecs/common/linux.conf \
- /usr/share/qt4/mkspecs/qconfig.pri \
- /usr/share/qt4/mkspecs/modules/qt_webkit_version.pri \
- /usr/share/qt4/mkspecs/features/qt_functions.prf \
- /usr/share/qt4/mkspecs/features/qt_config.prf \
- /usr/share/qt4/mkspecs/features/exclusive_builds.prf \
- /usr/share/qt4/mkspecs/features/default_pre.prf \
- /usr/share/qt4/mkspecs/features/release.prf \
- /usr/share/qt4/mkspecs/features/default_post.prf \
- /usr/share/qt4/mkspecs/features/link_pkgconfig.prf \
- /usr/share/qt4/mkspecs/features/warn_on.prf \
- /usr/share/qt4/mkspecs/features/qt.prf \
- /usr/share/qt4/mkspecs/features/unix/thread.prf \
- /usr/share/qt4/mkspecs/features/moc.prf \
- /usr/share/qt4/mkspecs/features/resources.prf \
- /usr/share/qt4/mkspecs/features/uic.prf \
- /usr/share/qt4/mkspecs/features/yacc.prf \
- /usr/share/qt4/mkspecs/features/lex.prf \
- /usr/share/qt4/mkspecs/features/include_source_dir.prf \
- /usr/lib/i386-linux-gnu/libQtDeclarative.prl \
- /usr/lib/i386-linux-gnu/libQtGui.prl \
- /usr/lib/i386-linux-gnu/libQtNetwork.prl \
- /usr/lib/i386-linux-gnu/libQtCore.prl
- $(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
-/usr/share/qt4/mkspecs/common/g++.conf:
-/usr/share/qt4/mkspecs/common/unix.conf:
-/usr/share/qt4/mkspecs/common/linux.conf:
-/usr/share/qt4/mkspecs/qconfig.pri:
-/usr/share/qt4/mkspecs/modules/qt_webkit_version.pri:
-/usr/share/qt4/mkspecs/features/qt_functions.prf:
-/usr/share/qt4/mkspecs/features/qt_config.prf:
-/usr/share/qt4/mkspecs/features/exclusive_builds.prf:
-/usr/share/qt4/mkspecs/features/default_pre.prf:
-/usr/share/qt4/mkspecs/features/release.prf:
-/usr/share/qt4/mkspecs/features/default_post.prf:
-/usr/share/qt4/mkspecs/features/link_pkgconfig.prf:
-/usr/share/qt4/mkspecs/features/warn_on.prf:
-/usr/share/qt4/mkspecs/features/qt.prf:
-/usr/share/qt4/mkspecs/features/unix/thread.prf:
-/usr/share/qt4/mkspecs/features/moc.prf:
-/usr/share/qt4/mkspecs/features/resources.prf:
-/usr/share/qt4/mkspecs/features/uic.prf:
-/usr/share/qt4/mkspecs/features/yacc.prf:
-/usr/share/qt4/mkspecs/features/lex.prf:
-/usr/share/qt4/mkspecs/features/include_source_dir.prf:
-/usr/lib/i386-linux-gnu/libQtDeclarative.prl:
-/usr/lib/i386-linux-gnu/libQtGui.prl:
-/usr/lib/i386-linux-gnu/libQtNetwork.prl:
-/usr/lib/i386-linux-gnu/libQtCore.prl:
+Makefile: mardrone.pro /usr/local/Qt4.8/mkspecs/macx-g++/qmake.conf /usr/local/Qt4.8/mkspecs/common/unix.conf \
+ /usr/local/Qt4.8/mkspecs/common/mac.conf \
+ /usr/local/Qt4.8/mkspecs/common/gcc-base.conf \
+ /usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf \
+ /usr/local/Qt4.8/mkspecs/common/g++-base.conf \
+ /usr/local/Qt4.8/mkspecs/common/g++-macx.conf \
+ /usr/local/Qt4.8/mkspecs/qconfig.pri \
+ /usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri \
+ /usr/local/Qt4.8/mkspecs/features/qt_functions.prf \
+ /usr/local/Qt4.8/mkspecs/features/qt_config.prf \
+ /usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf \
+ /usr/local/Qt4.8/mkspecs/features/default_pre.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf \
+ deploy.pri \
+ /usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf \
+ /usr/local/Qt4.8/mkspecs/features/debug.prf \
+ /usr/local/Qt4.8/mkspecs/features/default_post.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/default_post.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf \
+ /usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf \
+ /usr/local/Qt4.8/mkspecs/features/declarative_debug.prf \
+ /usr/local/Qt4.8/mkspecs/features/warn_on.prf \
+ /usr/local/Qt4.8/mkspecs/features/qt.prf \
+ /usr/local/Qt4.8/mkspecs/features/unix/thread.prf \
+ /usr/local/Qt4.8/mkspecs/features/moc.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/rez.prf \
+ /usr/local/Qt4.8/mkspecs/features/mac/sdk.prf \
+ /usr/local/Qt4.8/mkspecs/features/resources.prf \
+ /usr/local/Qt4.8/mkspecs/features/uic.prf \
+ /usr/local/Qt4.8/mkspecs/features/yacc.prf \
+ /usr/local/Qt4.8/mkspecs/features/lex.prf \
+ /usr/local/Qt4.8/mkspecs/features/include_source_dir.prf \
+ /Library/Frameworks/QtDeclarative.framework/QtDeclarative.prl \
+ /Library/Frameworks/QtScript.framework/QtScript.prl \
+ /Library/Frameworks/QtCore.framework/QtCore.prl \
+ /Library/Frameworks/QtSvg.framework/QtSvg.prl \
+ /Library/Frameworks/QtGui.framework/QtGui.prl \
+ /Library/Frameworks/QtSql.framework/QtSql.prl \
+ /Library/Frameworks/QtXmlPatterns.framework/QtXmlPatterns.prl \
+ /Library/Frameworks/QtNetwork.framework/QtNetwork.prl
+ $(QMAKE) -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
+/usr/local/Qt4.8/mkspecs/common/unix.conf:
+/usr/local/Qt4.8/mkspecs/common/mac.conf:
+/usr/local/Qt4.8/mkspecs/common/gcc-base.conf:
+/usr/local/Qt4.8/mkspecs/common/gcc-base-macx.conf:
+/usr/local/Qt4.8/mkspecs/common/g++-base.conf:
+/usr/local/Qt4.8/mkspecs/common/g++-macx.conf:
+/usr/local/Qt4.8/mkspecs/qconfig.pri:
+/usr/local/Qt4.8/mkspecs/modules/qt_webkit_version.pri:
+/usr/local/Qt4.8/mkspecs/features/qt_functions.prf:
+/usr/local/Qt4.8/mkspecs/features/qt_config.prf:
+/usr/local/Qt4.8/mkspecs/features/exclusive_builds.prf:
+/usr/local/Qt4.8/mkspecs/features/default_pre.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/default_pre.prf:
+deploy.pri:
+/usr/local/Qt4.8/mkspecs/features/mac/dwarf2.prf:
+/usr/local/Qt4.8/mkspecs/features/debug.prf:
+/usr/local/Qt4.8/mkspecs/features/default_post.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/default_post.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/x86_64.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/objective_c.prf:
+/usr/local/Qt4.8/mkspecs/features/link_pkgconfig.prf:
+/usr/local/Qt4.8/mkspecs/features/declarative_debug.prf:
+/usr/local/Qt4.8/mkspecs/features/warn_on.prf:
+/usr/local/Qt4.8/mkspecs/features/qt.prf:
+/usr/local/Qt4.8/mkspecs/features/unix/thread.prf:
+/usr/local/Qt4.8/mkspecs/features/moc.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/rez.prf:
+/usr/local/Qt4.8/mkspecs/features/mac/sdk.prf:
+/usr/local/Qt4.8/mkspecs/features/resources.prf:
+/usr/local/Qt4.8/mkspecs/features/uic.prf:
+/usr/local/Qt4.8/mkspecs/features/yacc.prf:
+/usr/local/Qt4.8/mkspecs/features/lex.prf:
+/usr/local/Qt4.8/mkspecs/features/include_source_dir.prf:
+/Library/Frameworks/QtDeclarative.framework/QtDeclarative.prl:
+/Library/Frameworks/QtScript.framework/QtScript.prl:
+/Library/Frameworks/QtCore.framework/QtCore.prl:
+/Library/Frameworks/QtSvg.framework/QtSvg.prl:
+/Library/Frameworks/QtGui.framework/QtGui.prl:
+/Library/Frameworks/QtSql.framework/QtSql.prl:
+/Library/Frameworks/QtXmlPatterns.framework/QtXmlPatterns.prl:
+/Library/Frameworks/QtNetwork.framework/QtNetwork.prl:
qmake: FORCE
- @$(QMAKE) -spec /usr/share/qt4/mkspecs/linux-g++ -o Makefile mardrone.pro
-
+ @$(QMAKE) -spec /usr/local/Qt4.8/mkspecs/macx-g++ CONFIG+=declarative_debug -o Makefile mardrone.pro
+
+mardrone.app/Contents/PkgInfo:
+ @$(CHK_DIR_EXISTS) mardrone.app/Contents || $(MKDIR) mardrone.app/Contents
+ @$(DEL_FILE) mardrone.app/Contents/PkgInfo
+ @echo "APPL????" >mardrone.app/Contents/PkgInfo
+mardrone.app/Contents/Resources/empty.lproj:
+ @$(CHK_DIR_EXISTS) mardrone.app/Contents/Resources || $(MKDIR) mardrone.app/Contents/Resources
+ @touch mardrone.app/Contents/Resources/empty.lproj
+
+mardrone.app/Contents/Info.plist:
+ @$(CHK_DIR_EXISTS) mardrone.app/Contents || $(MKDIR) mardrone.app/Contents
+ @$(DEL_FILE) mardrone.app/Contents/Info.plist
+ @sed -e "s,@SHORT_VERSION@,1.0,g" -e "s,@TYPEINFO@,????,g" -e "s,@ICON@,,g" -e "s,@EXECUTABLE@,mardrone,g" -e "s,@TYPEINFO@,????,g" /usr/local/Qt4.8/mkspecs/macx-g++/Info.plist.app >mardrone.app/Contents/Info.plist
dist:
@$(CHK_DIR_EXISTS) .tmp/mardrone1.0.0 || $(MKDIR) .tmp/mardrone1.0.0
- $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents dronelib/dronecontrol.h dronelib/navdata.h dronelib/video.h gauges/gauge.h gauges/gaugelabel.h gauges/gaugetape.h gauges/gaugehorizon.h dronelib/joystick.h qdeclarativetoucharea.h .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents ardrone.qrc .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents main.cpp dronelib/dronecontrol.cpp dronelib/navdata.cpp dronelib/video.cpp gauges/gauge.cpp gauges/gaugelabel.cpp gauges/gaugetape.cpp gauges/gaugehorizon.cpp dronelib/joystick.cpp qdeclarativetoucharea.cpp .tmp/mardrone1.0.0/ && (cd `dirname .tmp/mardrone1.0.0` && $(TAR) mardrone1.0.0.tar mardrone1.0.0 && $(COMPRESS) mardrone1.0.0.tar) && $(MOVE) `dirname .tmp/mardrone1.0.0`/mardrone1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mardrone1.0.0
+ $(COPY_FILE) --parents $(SOURCES) $(DIST) .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents dronelib/dronecontrol.h dronelib/navdata.h dronelib/video.h gauges/gauge.h gauges/gaugelabel.h gauges/gaugetape.h gauges/gaugehorizon.h dronelib/joystick.h qdeclarativetoucharea.h gauges/gaugearc.h uilistelement.h gauges/gaugehsi.h .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents ardrone.qrc .tmp/mardrone1.0.0/ && $(COPY_FILE) --parents main.cpp dronelib/dronecontrol.cpp dronelib/navdata.cpp dronelib/video.cpp gauges/gauge.cpp gauges/gaugelabel.cpp gauges/gaugetape.cpp gauges/gaugehorizon.cpp dronelib/joystick.cpp qdeclarativetoucharea.cpp gauges/gaugearc.cpp uilistelement.cpp gauges/gaugehsi.cpp .tmp/mardrone1.0.0/ && (cd `dirname .tmp/mardrone1.0.0` && $(TAR) mardrone1.0.0.tar mardrone1.0.0 && $(COMPRESS) mardrone1.0.0.tar) && $(MOVE) `dirname .tmp/mardrone1.0.0`/mardrone1.0.0.tar.gz . && $(DEL_FILE) -r .tmp/mardrone1.0.0
clean:compiler_clean
####### Sub-libraries
distclean: clean
- -$(DEL_FILE) $(TARGET)
+ -$(DEL_FILE) -r mardrone.app
-$(DEL_FILE) Makefile
mocables: compiler_moc_header_make_all compiler_moc_source_make_all
-compiler_moc_header_make_all: moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp
+compiler_objective_c_make_all:
+compiler_objective_c_clean:
+compiler_moc_header_make_all: moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp moc_gaugearc.cpp moc_uilistelement.cpp moc_gaugehsi.cpp
compiler_moc_header_clean:
- -$(DEL_FILE) moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp
+ -$(DEL_FILE) moc_dronecontrol.cpp moc_navdata.cpp moc_video.cpp moc_gauge.cpp moc_gaugelabel.cpp moc_gaugetape.cpp moc_gaugehorizon.cpp moc_joystick.cpp moc_qdeclarativetoucharea.cpp moc_gaugearc.cpp moc_uilistelement.cpp moc_gaugehsi.cpp
moc_dronecontrol.cpp: dronelib/dronecontrol.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/dronecontrol.h -o moc_dronecontrol.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/dronecontrol.h -o moc_dronecontrol.cpp
moc_navdata.cpp: dronelib/navdata.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/navdata.h -o moc_navdata.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/navdata.h -o moc_navdata.cpp
moc_video.cpp: dronelib/dronecontrol.h \
dronelib/video.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/video.h -o moc_video.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/video.h -o moc_video.cpp
moc_gauge.cpp: gauges/gauge.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gauge.h -o moc_gauge.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gauge.h -o moc_gauge.cpp
moc_gaugelabel.cpp: gauges/gauge.h \
gauges/gaugelabel.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugelabel.h -o moc_gaugelabel.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugelabel.h -o moc_gaugelabel.cpp
moc_gaugetape.cpp: gauges/gauge.h \
gauges/gaugetape.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugetape.h -o moc_gaugetape.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugetape.h -o moc_gaugetape.cpp
moc_gaugehorizon.cpp: gauges/gauge.h \
gauges/gaugehorizon.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) gauges/gaugehorizon.h -o moc_gaugehorizon.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugehorizon.h -o moc_gaugehorizon.cpp
moc_joystick.cpp: dronelib/joystick.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) dronelib/joystick.h -o moc_joystick.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ dronelib/joystick.h -o moc_joystick.cpp
moc_qdeclarativetoucharea.cpp: qdeclarativetoucharea.h
- /usr/bin/moc-qt4 $(DEFINES) $(INCPATH) qdeclarativetoucharea.h -o moc_qdeclarativetoucharea.cpp
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ qdeclarativetoucharea.h -o moc_qdeclarativetoucharea.cpp
+
+moc_gaugearc.cpp: gauges/gauge.h \
+ gauges/gaugearc.h
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugearc.h -o moc_gaugearc.cpp
+
+moc_uilistelement.cpp: uilistelement.h
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ uilistelement.h -o moc_uilistelement.cpp
+
+moc_gaugehsi.cpp: gauges/gaugehsi.h
+ /Developer/Tools/Qt/moc $(DEFINES) $(INCPATH) -D__APPLE__ -D__GNUC__ gauges/gaugehsi.h -o moc_gaugehsi.cpp
compiler_rcc_make_all: qrc_ardrone.cpp
compiler_rcc_clean:
gauges/HeadingGauge.qml \
ConfigDialogDesktop.qml \
ardrone_harmattan.qml \
+ gauges/GenericGauge.qml \
gauges/AltGauge.qml \
gear32x32.png \
+ gauges/tach-2700-redline.png \
gauges/EfisPFD.qml \
gauges/hdg2.png \
gauges/glareshield1.png \
joybox.png \
ardrone_desktop.qml \
gauges/ati4.png \
+ ardrone_plainqml.qml \
gauges/bezel.png \
gauges/alt2.png \
ConfigDialog.qml \
gauges/EfisPFD.qml \
gauges/AltGauge.qml \
gauges/qmldir
- /usr/bin/rcc -name ardrone ardrone.qrc -o qrc_ardrone.cpp
+ /Developer/Tools/Qt/rcc -name ardrone ardrone.qrc -o qrc_ardrone.cpp
compiler_image_collection_make_all: qmake_image_collection.cpp
compiler_image_collection_clean:
-$(DEL_FILE) qmake_image_collection.cpp
compiler_moc_source_make_all:
compiler_moc_source_clean:
+compiler_rez_source_make_all:
+compiler_rez_source_clean:
compiler_uic_make_all:
compiler_uic_clean:
compiler_yacc_decl_make_all:
####### Compile
-main.o: main.cpp qdeclarativetoucharea.h
+main.o: main.cpp uilistelement.h \
+ qdeclarativetoucharea.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o main.o main.cpp
dronecontrol.o: dronelib/dronecontrol.cpp dronelib/dronecontrol.h \
qdeclarativetoucharea.o: qdeclarativetoucharea.cpp qdeclarativetoucharea.h
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qdeclarativetoucharea.o qdeclarativetoucharea.cpp
+gaugearc.o: gauges/gaugearc.cpp gauges/gaugearc.h \
+ gauges/gauge.h \
+ gauges/gaugetape.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugearc.o gauges/gaugearc.cpp
+
+uilistelement.o: uilistelement.cpp uilistelement.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o uilistelement.o uilistelement.cpp
+
+gaugehsi.o: gauges/gaugehsi.cpp gauges/gaugehsi.h
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o gaugehsi.o gauges/gaugehsi.cpp
+
moc_dronecontrol.o: moc_dronecontrol.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_dronecontrol.o moc_dronecontrol.cpp
moc_qdeclarativetoucharea.o: moc_qdeclarativetoucharea.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_qdeclarativetoucharea.o moc_qdeclarativetoucharea.cpp
+moc_gaugearc.o: moc_gaugearc.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugearc.o moc_gaugearc.cpp
+
+moc_uilistelement.o: moc_uilistelement.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_uilistelement.o moc_uilistelement.cpp
+
+moc_gaugehsi.o: moc_gaugehsi.cpp
+ $(CXX) -c $(CXXFLAGS) $(INCPATH) -o moc_gaugehsi.o moc_gaugehsi.cpp
+
qrc_ardrone.o: qrc_ardrone.cpp
$(CXX) -c $(CXXFLAGS) $(INCPATH) -o qrc_ardrone.o qrc_ardrone.cpp
####### Install
install_target: first FORCE
- @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/local/bin/ || $(MKDIR) $(INSTALL_ROOT)/usr/local/bin/
- -$(INSTALL_PROGRAM) "$(QMAKE_TARGET)" "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
- -$(STRIP) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/mardrone/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/mardrone/bin/
+ $(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+
+ -$(INSTALL_DIR) "mardrone.app" "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
uninstall_target: FORCE
- -$(DEL_FILE) "$(INSTALL_ROOT)/usr/local/bin/$(QMAKE_TARGET)"
- -$(DEL_DIR) $(INSTALL_ROOT)/usr/local/bin/
+ -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+ -$(DEL_DIR) $(INSTALL_ROOT)/opt/mardrone/bin/
install_desktopfile: first FORCE
@$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/
- -$(INSTALL_FILE) /mnt/hgfs/scratchbox/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/
+ -$(INSTALL_FILE) /Users/kate/scratchbox/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/
uninstall_desktopfile: FORCE
-$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/
-install: install_target install_desktopfile FORCE
+install_desktopfile: first FORCE
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/usr/share/applications/ || $(MKDIR) $(INSTALL_ROOT)/usr/share/applications/
+ -$(INSTALL_FILE) /Users/kate/scratchbox/harmattan/mardrone/mardrone/mardrone.desktop $(INSTALL_ROOT)/usr/share/applications/
+
+
+uninstall_desktopfile: FORCE
+ -$(DEL_FILE) -r $(INSTALL_ROOT)/usr/share/applications/mardrone.desktop
+ -$(DEL_DIR) $(INSTALL_ROOT)/usr/share/applications/
+
+
+install_target: first FORCE
+ @$(CHK_DIR_EXISTS) $(INSTALL_ROOT)/opt/mardrone/bin/ || $(MKDIR) $(INSTALL_ROOT)/opt/mardrone/bin/
+ $(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+
+ -$(INSTALL_DIR) "mardrone.app" "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+
+uninstall_target: FORCE
+ -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+ -$(DEL_FILE) -r "$(INSTALL_ROOT)/opt/mardrone/bin/mardrone.app"
+ -$(DEL_DIR) $(INSTALL_ROOT)/opt/mardrone/bin/
+
+
+install: install_target install_desktopfile install_desktopfile install_target FORCE
-uninstall: uninstall_target uninstall_desktopfile FORCE
+uninstall: uninstall_target uninstall_desktopfile uninstall_desktopfile uninstall_target FORCE
FORCE:
groundColor:"#00000000"
width:640;height:480;
}
-
-
Text {
y:100
-
- // visible:drone.confUseAccel
+ visible:drone.confShowDebug
color: "#00FF00"
id: droneCtrlValues
font.pixelSize:20
+// uiName:Harmattan
import QtQuick 1.0
import com.nokia.meego 1.0
import Drone 1.0
groundColor:"#00000000"
// value:lj.xv
// value2:lj.yv
- width:640;height:480;
+ width:560;height:400;
}
+// uiName:Plain Qml
import QtQuick 1.0
import Drone 1.0
//import gauges 1.0
+// uiName:Symbian
import QtQuick 1.0
import com.nokia.symbian 1.1
import Drone 1.0
color:indicatorColor
backColor:"#40000000"
value:alt
- x:90;y:tapeMargin/2-10
+// x:90;
+ anchors.horizontalCenter: parent.horizontalCenter
+ y:tapeMargin/2-10
width:(pfd.width-tapeMargin*2-50)*pfd.displayScale;height:60
}
GaugeHSI {
font: root.platformStyle.itemFont
}
Component.onCompleted: {
+ console.debug("SelectionDialog delegate ",name,file)
try {
// Legacy. "name" used to be the role which was used by delegate
itemText.text = name
flickableItem: selectionListView
platformStyle.inverted: true
}
- onModelChanged: selectionContent.listViewHeight = model.count * platformStyle.itemHeight
+ onCountChanged: selectionContent.listViewHeight = (typeof model.count === 'undefined' ? model.length : model.count) * platformStyle.itemHeight
+ onModelChanged: selectionContent.listViewHeight = (typeof model.count === 'undefined' ? model.length : model.count) * platformStyle.itemHeight
}
}
#include "qdeclarativetoucharea.h"
#include <QList>
-QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI,uiListModel &uiList);
+QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI,uiListModel &uiList,QStringList &uiNames,QStringList &uiFiles);
// MacOSX sdl hack so that SDL won't hijack main
#undef main
QUrl *url;
uiListModel uiList;
bool setDefault=false;
-
-/* uiList.addUI(new uiListElement("MeeGo","ardrone_harmattan.qml"));
- uiList.addUI(new uiListElement("Symbian","ardrone_symbian.qml"));
- uiList.addUI(new uiListElement("Desktop","ardrone_desktop.qml"));
- uiList.addUI(new uiListElement("PlainQml","ardrone_plainqml.qml"));
-*/
+ QStringList uiNames,uiFiles;
QSettings *mardroneSettings=new QSettings("katix.org","mardrone");
#ifdef QT_IOS
// Check available UI's
window.engine()->addImportPath("qrc:/gauges/");
window.engine()->addImportPath("qrc:");
+ window.engine()->addImportPath(":");
window.engine()->addImportPath("gauges");
window.engine()->addImportPath(".");
#ifdef Q_OS_ANDROID
qDebug() << "ImportPathList" << window.engine()->importPathList() ;
QStringList importPath=window.engine()->importPathList();
window.rootContext()->setContextProperty("uiList",&uiList);
- QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi,uiList);
+ window.rootContext()->setContextProperty("uiNames",uiNames);
+ window.rootContext()->setContextProperty("uiFiles",uiFiles);
+ QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi,uiList,uiNames,uiFiles);
if(setDefault) mardroneSettings->setValue("activeUI",qmlFile);
#ifndef QT_IOS
qmlFile=QString("qrc:/")+qmlFile;
return app.exec();
}
-QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,uiListModel &uiList)
+QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,uiListModel &uiList,QStringList &uiNames,QStringList &uiFiles)
{
bool haveHarmattan=FALSE;
bool haveSymbian=FALSE;
QString uiName;
appQmlFilesFilter << "ardrone*.qml";
QStringList appQmlFiles;
- qDebug() << "selectQmlMain importPath=" << importPaths << " ActiveUi=" << activeUI;
+ qDebug() << "selectQmlMain importPath=" << importPaths << " ActiveUi=" << activeUI;
+ if(cmdParam.contains(".qml")) return cmdParam;
+ if(cmdParam=="plain") activeUI="ardrone_plainqml.qml";
+ if(cmdParam=="harmattan") activeUI="ardrone_harmattan.qml";
+ if(cmdParam=="symbian") activeUI="ardrone_symbian.qml";
+ if(cmdParam=="desktop") activeUI="ardrone_desktop.qml";
+ // Scan supported components
for(int i=0;i<importPaths.size();i++) {
QString importPath=importPaths[i];
haveHarmattan|=QFile(importPath+"/com/nokia/meego").exists();
- haveHarmattan|=QFile(importPath+"/MeeGo/Components").exists();
haveSymbian|=QFile(importPath+"/com/nokia/symbian.1.1").exists();
haveDesktop|=QFile(importPath+"/QtDesktop").exists();
qDebug() << importPath << haveHarmattan << haveSymbian << haveDesktop;
+ }
+ // Scan UI .qml files
+ for(int i=0;i<importPaths.size();i++) {
+ QString importPath=importPaths[i];
QDir searchDir(importPath);
QStringList qmlFiles=searchDir.entryList(appQmlFilesFilter);
qDebug() << qmlFiles;
appQmlFiles+=qmlFiles;
for(int j=0;j<qmlFiles.size();j++) {
-
- QFile qmlFile(importPath+"/"+qmlFiles[j]);
- if(qmlFile.open(QFile::ReadOnly))
+ if((qmlFiles[j].contains("harmattan") && haveHarmattan)||
+ (qmlFiles[j].contains("symbian") && haveSymbian) ||
+ (qmlFiles[j].contains("desktop") && haveDesktop) ||
+ (qmlFiles[j].contains("plainqml")))
{
- QString firstLine=QString(qmlFile.readLine(100));
- if(firstLine.contains("// uiName:")) { uiName=firstLine.remove(0,10); }
- else uiName=qmlFiles[j];
- if(uiName.endsWith("\n")) uiName.chop(1);
- }
- qDebug() << importPath+"/"+qmlFiles[j] << uiName;
- uiList.addUI(new uiListElement(uiName,qmlFiles[j]));
+ QFile qmlFile(importPath+"/"+qmlFiles[j]);
+ if(qmlFile.open(QFile::ReadOnly))
+ {
+ QString firstLine=QString(qmlFile.readLine(100));
+ if(firstLine.contains("// uiName:")) { uiName=firstLine.remove(0,10); }
+ else uiName=qmlFiles[j];
+ if(uiName.endsWith("\n")) uiName.chop(1);
+ qDebug() << importPath+"/"+qmlFiles[j] << uiName;
+ uiList.addUI(new uiListElement(uiName,qmlFiles[j]));
+ }
}
+ }
}
-
- if(cmdParam.contains(".qml")) return cmdParam;
- if(cmdParam=="plain") return QString("ardrone_plainqml.qml");
- if(cmdParam.isEmpty() && !activeUI.isEmpty()) return activeUI;
- if(cmdParam=="harmattan" || cmdParam=="" ) return QString("ardrone_harmattan.qml");
- if(cmdParam=="symbian" || cmdParam=="" ) return QString("ardrone_symbian.qml");
- if(cmdParam=="desktop" || cmdParam=="" ) return QString("ardrone_desktop.qml");
-
+ // Check validity of activeUi
+ bool validUi=false;
+ for(int j=0;j<uiList.count();j++) validUi|=(((uiListElement*)uiList.get(j))->file())==activeUI;
+ if(!validUi) activeUI=((uiListElement*)uiList.get(0))->file();
return(activeUI);
}
android {
LIBS += -L../mardrone/ardrone-lib-android -lvlib -lsdk
# If you got cannot locate '__aeabi_f2uiz'..., uncomment following and point libgcc.a
- LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
+# LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/linux-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
+#For mac build environment
+ LIBS += ~/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/lib/gcc/arm-linux-androideabi/4.4.3/libgcc.a
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by Qt Creator 2.3.1, 2012-01-11T14:12:54. -->
+<!-- Written by Qt Creator 2.3.1, 2012-05-12T14:42:53. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
- <value type="int">1</value>
+ <value type="int">0</value>
</data>
<data>
<variable>ProjectExplorer.Project.EditorSettings</variable>
</valuemap>
</valuemap>
<value type="int" key="EditorConfiguration.CodeStyle.Count">1</value>
- <value type="QByteArray" key="EditorConfiguration.Codec">System</value>
+ <value type="QByteArray" key="EditorConfiguration.Codec">ISO-8859-1</value>
<value type="QString" key="EditorConfiguration.CurrentFallback">Global</value>
<value type="int" key="EditorConfiguration.IndentSize">4</value>
<value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-linux-generic-elf-32bit.gdb</value>
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">ProjectExplorer.ToolChain.Gcc:/usr/bin/g++.x86-macos-generic-mach_o-64bit./usr/bin/gdb</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
- <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">true</value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">false</value>
<value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
<value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt in PATH Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8 in PATH (System) Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/kate/scratchbox/harmattan/mardrone/mardrone</value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">2</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">3</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">1</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Harmattan</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.HarmattanDeviceTarget</value>
- <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">1</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/opt/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/gcc.arm-linux-generic-elf-32bit./opt/QtSDK/pythongdb/gdb</value>
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target (Qt SDK) Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.2 (Qt SDK) Release</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">23</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_2__Qt_SDK__Release</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
- <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Maemo:/opt/QtSDK/Madde/targets/harmattan_10.2011.34-1/bin/gcc.arm-linux-generic-elf-32bit./opt/QtSDK/pythongdb/gdb</value>
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
<value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
<valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target (Qt SDK) Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.2 (Qt SDK) Debug</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
<value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
- <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
- <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">23</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_2__Qt_SDK__Debug</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
<value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
</valuemap>
- <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
- <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.2">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Create Debian Package</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoDebianPackageCreationStep</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.0 (Qt SDK) Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Release</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.3">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.0 (Qt SDK) Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_0__Qt_SDK__Debug</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.4">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.1 (Qt SDK) Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_1__Qt_SDK__Release</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.5">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">INVALID</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Harmattan Target - QEmu PR1.1 (Qt SDK) Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_1__Qt_SDK__Debug</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">-1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">6</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Install Debian package to sysroot</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoInstallDebianPackageToSysrootStep</value>
</valuemap>
<valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy Debian package via SFTP upload</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">MaemoUploadAndInstallDpkgPackageStep</value>
<valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedFiles">
- <value type="QString">/mnt/hgfs/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target__Qt_SDK__Release/mardrone_0.2.0_armel.deb</value>
- <value type="QString">/mnt/hgfs/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target__Qt_SDK__Debug/mardrone_0.2.0_armel.deb</value>
+ <value type="QString">/Users/kate/scratchbox/harmattan/mardrone/mardrone-build-harmattan-Harmattan_Target_-_QEmu_PR1_2__Qt_SDK__Release/mardrone_0.2.0_armel.deb</value>
</valuelist>
<valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedHosts">
<value type="QString">192.168.2.15</value>
- <value type="QString">192.168.2.15</value>
</valuelist>
<valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedRemotePaths">
<value type="QString"></value>
- <value type="QString"></value>
</valuelist>
<valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.LastDeployedTimes">
- <value type="QDateTime">2011-12-20T13:12:09</value>
- <value type="QDateTime">2011-12-21T19:30:29</value>
+ <value type="QDateTime">2012-05-07T15:56:16</value>
</valuelist>
</valuemap>
<value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build Debian Package and Install to Harmattan Device</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">DeployToHarmattan</value>
- <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">1</value>
+ <value type="qulonglong" key="Qt4ProjectManager.MaemoRunConfiguration.DeviceId">0</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
<valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
<valuelist type="QVariantList" key="Qt4ProjectManager.MaemoRunConfiguration.UserEnvironmentChanges"/>
<value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
<value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
- <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
<value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
</valuemap>
<value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
</valuemap>
</data>
<data>
+ <variable>ProjectExplorer.Project.Target.2</variable>
+ <valuemap type="QVariantMap">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Android</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Android</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Target.AndroidDeviceTarget</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
+ <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.0">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Android:/Users/kate/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-gcc.arm-linux-android-elf-32bit.</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Necessitas Qt 4.8.0 for Android armv5 Debug</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">2</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.BuildConfiguration.1">
+ <value type="QString" key="ProjectExplorer.BuildCOnfiguration.ToolChain">Qt4ProjectManager.ToolChain.Android:/Users/kate/necessitas/android-ndk-r6b/toolchains/arm-linux-androideabi-4.4.3/prebuilt/darwin-x86/bin/arm-linux-androideabi-gcc.arm-linux-android-elf-32bit.</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmake</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QtProjectManager.QMakeBuildStep</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibrary">false</value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.LinkQmlDebuggingLibraryAuto">true</value>
+ <value type="QString" key="QtProjectManager.QMakeBuildStep.QMakeArguments"></value>
+ <value type="bool" key="QtProjectManager.QMakeBuildStep.QMakeForced">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments"></value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Build</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Build</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.1">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.MakeStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">true</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">clean</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Clean</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Clean</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">2</value>
+ <value type="bool" key="ProjectExplorer.BuildConfiguration.ClearSystemEnvironment">false</value>
+ <valuelist type="QVariantList" key="ProjectExplorer.BuildConfiguration.UserEnvironmentChanges"/>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Necessitas Qt 4.8.0 for Android armv5 Release</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.Qt4BuildConfiguration</value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildConfiguration">0</value>
+ <value type="QString" key="Qt4ProjectManager.Qt4BuildConfiguration.BuildDirectory"></value>
+ <value type="int" key="Qt4ProjectManager.Qt4BuildConfiguration.QtVersionId">1</value>
+ <value type="bool" key="Qt4ProjectManager.Qt4BuildConfiguration.UseShadowBuild">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">2</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.0">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Copy application data</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageInstallationStep</value>
+ <value type="bool" key="Qt4ProjectManager.MakeStep.Clean">false</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeArguments">INSTALL_ROOT="/Users/kate/scratchbox/harmattan/mardrone/mardrone/android" install</value>
+ <value type="QString" key="Qt4ProjectManager.MakeStep.MakeCommand"></value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.1">
+ <value type="QString" key="KeystoreLocation"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Packaging for Android</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidPackageCreationStep</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.BuildStepList.Step.2">
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Android device</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidDeployStep</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">3</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy to Android device</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run on Android device</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
+ </valuemap>
+ <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.1">
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
+ <value type="int">0</value>
+ <value type="int">1</value>
+ <value type="int">2</value>
+ <value type="int">3</value>
+ <value type="int">4</value>
+ <value type="int">5</value>
+ <value type="int">6</value>
+ <value type="int">7</value>
+ <value type="int">8</value>
+ <value type="int">9</value>
+ <value type="int">10</value>
+ <value type="int">11</value>
+ <value type="int">12</value>
+ <value type="int">13</value>
+ <value type="int">14</value>
+ </valuelist>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Run on Android device</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Run on Android device2</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">Qt4ProjectManager.AndroidRunConfiguration</value>
+ <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
+ <value type="bool" key="RunConfiguration.UseCppDebugger">true</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebugger">false</value>
+ <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">true</value>
+ </valuemap>
+ <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">2</value>
+ </valuemap>
+ </data>
+ <data>
<variable>ProjectExplorer.Project.TargetCount</variable>
- <value type="int">2</value>
+ <value type="int">3</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
- <value type="QString">{900e65ba-cc00-43b1-ab21-347709bd318b}</value>
+ <value type="QString">{6e91175b-1930-4339-be61-c1d13216a9de}</value>
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
{
QHash<int, QByteArray> roles;
roles[NameRole] = "name";
+ roles[TextRole] = "text";
roles[FileRole] = "file";
- roles[ModelDataRole] = "modelData";
setRoleNames(roles);
}
int uiListModel::rowCount(const QModelIndex & parent) const {
return m_uiList.count();
}
- int uiListModel::count()
-{
- qDebug() <<"Count:" << m_uiList.count();
- return m_uiList.count();
- }
QVariant uiListModel::data(const QModelIndex & index, int role) const {
if (index.row() < 0 || index.row() > m_uiList.count())
return QVariant();
-
+qDebug() << "uiListModel::data" << index << role;
const uiListElement *ui = m_uiList[index.row()];
- if (role == NameRole)
+
+ if (role == NameRole ||role == TextRole ) {
+ qDebug() << "uiListModel::data" << index << role << ui->name();
return ui->name();
- else if (role == FileRole)
+ }
+ else if (role == FileRole) {
+ qDebug() << "uiListModel::data" << index << role << ui->file();
return ui->file();
- else if (role == ModelDataRole)
- return ui->modelData();
+ }
return QVariant();
}
Q_PROPERTY(QString name READ name WRITE setName);
Q_PROPERTY(QString file READ file WRITE setFile);
QString name() const { return m_name;} ; void setName(QString val) { m_name=val;};
- QString modelData() const { return m_name;} ; void setModelData(QString val) { m_name=val;};
+// QString modelData() const { return m_name;} ; void setModelData(QString val) { m_name=val;};
QString file() const { return m_file;} ; void setFile(QString val) { m_file=val;};
explicit uiListElement(QObject *parent = 0);
public:
enum uiRoles {
NameRole = Qt::UserRole + 1,
- FileRole,
- ModelDataRole
+ TextRole,
+ FileRole
};
uiListModel(QObject *parent = 0);
void addUI(uiListElement *ui);
int rowCount(const QModelIndex & parent = QModelIndex()) const;
- Q_INVOKABLE int count();
- Q_INVOKABLE int roles() { return roleNames().size(); }
-
+ Q_INVOKABLE int count() { return m_uiList.count(); };
+ Q_INVOKABLE int roles() { return roleNames().size(); };
Q_INVOKABLE QObject * get(int index) const { return m_uiList[index];};
+ Q_INVOKABLE void removeAt(int index) { m_uiList.removeAt(index);};
QVariant data(const QModelIndex & index, int role = Qt::DisplayRole) const;
private:
projects / mardrone / commitdiff