Permalink
Browse files

Merge branch 'master' of https://github.com/qreal/qreal into sbt

Conflicts:
	installer/qrealRobots.xml
	plugins/metaEditor/editor/metaEditor.xml
	plugins/metaEditor/metaEditorSupport/editorGenerator.cpp
	plugins/metaEditor/metaEditorSupport/metaEditorSupportPlugin.cpp
	plugins/plugins.pro
	qrgui/mainwindow/mainWindow.cpp
	qrgui/mainwindow/mainWindow.h
	qrgui/qrgui_ru.qm
	qrgui/qrgui_ru.ts
	qrgui/umllib/nodeElement.cpp
	qrgui/view/propertyEditorView.cpp
	qrkernel/qrkernel.qrc
	qrkernel/settingsManager.cpp
	qrkernel/settingsManager.h
	qrmc/qrmc-lib.pro
	qrmc/templates/edge.template
	qrrepo/commonRepoApi.h
	qrrepo/private/repoApi.cpp
	qrutils/qrutils.pro
  • Loading branch information...
MariaLitvinova committed Sep 15, 2012
2 parents 7101b17 + fb5c4d9 commit 950e56f44fa6bd549de1230ac57de433f732d11e
Showing 513 changed files with 67,494 additions and 4,465 deletions.
View
@@ -0,0 +1,22 @@
+language: cpp
+compiler: gcc
+install:
+ - sudo apt-get update
+ - sudo apt-get install libqt4-dev qt4-qmake qt4-dev-tools
+
+script:
+ - cat /proc/cpuinfo
+ - cat /proc/meminfo
+ - qmake qrealRobots.pro
+ - make -j2
+ - make distclean
+ - qmake qrealTest.pro CONFIG+=debug
+ - make -j2
+ - ./bin/unittests/qrlibs_unittests
+ - ./bin/unittests/qrgui_unittests
+ - ./bin/unittests/qrxc_unittests
+
+notifications:
+ email:
+ recipients:
+ - qreal-build-reports@googlegroups.com
View
@@ -38,7 +38,7 @@ PROJECT_NUMBER =
# If a relative path is entered, it will be relative to the location
# where doxygen was started. If left blank the current directory will be used.
-OUTPUT_DIRECTORY = C:\Hudson\jobs\Documentation\workspace\doxygen
+OUTPUT_DIRECTORY = installer
# If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
# 4096 sub-directories (in 2 levels) under the output directory of each output
@@ -60,7 +60,7 @@ CREATE_SUBDIRS = NO
# Polish, Portuguese, Romanian, Russian, Serbian, Serbian-Cyrilic, Slovak,
# Slovene, Spanish, Swedish, Ukrainian, and Vietnamese.
-OUTPUT_LANGUAGE = Russian
+OUTPUT_LANGUAGE = English
# If the BRIEF_MEMBER_DESC tag is set to YES (the default) Doxygen will
# include brief member descriptions after the members that are listed in
@@ -180,7 +180,7 @@ SEPARATE_MEMBER_PAGES = NO
# The TAB_SIZE tag can be used to set the number of spaces in a tab.
# Doxygen uses this value to replace tabs by spaces in code fragments.
-TAB_SIZE = 8
+TAB_SIZE = 4
# This tag can be used to specify a number of aliases that acts
# as commands in the documentation. An alias has the form "name=value".
@@ -590,7 +590,7 @@ WARN_LOGFILE =
# directories like "/usr/src/myproject". Separate the files or directories
# with spaces.
-INPUT = C:\Hudson\jobs\Documentation\workspace\unreal
+INPUT =
# This tag can be used to specify the character encoding of the source files
# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -1438,7 +1438,7 @@ HIDE_UNDOC_RELATIONS = YES
# toolkit from AT&T and Lucent Bell Labs. The other options in this section
# have no effect if this option is set to NO (the default)
-HAVE_DOT = YES
+HAVE_DOT =
# By default doxygen will write a font called FreeSans.ttf to the output
# directory and reference it in all dot files that doxygen generates. This
@@ -1,7 +1,7 @@
<project>
<shortName>QRealRobots</shortName>
<fullName>QReal Robots</fullName>
- <version>%version%</version>
+ <version>1.5</version>
<licenseFile>%1/installer/gpl-3.0.txt</licenseFile>
<leftImage>%1/installer/left.png</leftImage>
<logoImage>%1/installer/logo.png</logoImage>
@@ -102,7 +102,7 @@
<origin>%2/QtXml4.dll</origin>
</distributionFile>
<distributionFile>
- <origin>%2/../../../../../mingw/bin/libgcc_s_dw2-1.dll</origin>
+ <origin>%2//../../../../../mingw/bin/libgcc_s_dw2-1.dll</origin>
</distributionFile>
<distributionFile>
<origin>%1/installer/icon.ico</origin>
Oops, something went wrong.

0 comments on commit 950e56f

Please sign in to comment.