Arin Alexander 
							
						 
					 
					
						
						
							
						
						c37a310918 
					 
					
						
						
							
							Merge branch '1.4' into 1.4_QJSEngine  
						
						 
						
						... 
						
						
						
						# Conflicts:
#	limereport/lritemdesignintf.cpp
#	limereport/lrreportrender.cpp
#	limereport/lrscriptenginemanager.cpp 
						
						
					 
					
						2017-02-08 19:21:08 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arin Alexander 
							
						 
					 
					
						
						
							
						
						3807ac0c57 
					 
					
						
						
							
							limereport.pri for static building and aliases have been added  
						
						 
						
						
						
						
					 
					
						2016-12-22 02:08:27 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arin Alexander 
							
						 
					 
					
						
						
							
						
						6d31f20566 
					 
					
						
						
							
							OneSlotDS has been added to demo_r1  
						
						 
						
						
						
						
					 
					
						2016-12-06 00:27:22 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arin Alex 
							
						 
					 
					
						
						
							
						
						2034aa15c8 
					 
					
						
						
							
							QJSEngine has been added  
						
						 
						
						
						
						
					 
					
						2016-11-01 20:42:45 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arin Alexander 
							
						 
					 
					
						
						
							
						
						ebde2c1c20 
					 
					
						
						
							
							Hide unused warnings  
						
						 
						
						
						
						
					 
					
						2016-10-18 15:00:26 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								Arin Alexander 
							
						 
					 
					
						
						
							
						
						9d9f1f4d98 
					 
					
						
						
							
							Callback interface has been simplified  
						
						 
						
						... 
						
						
						
						From now on if slot getCallbackData(const LimeReport::CallbackInfo& info, QVariant& data) returns row count then there is no more need to implement second slot changePos(const LimeReport::CallbackInfo::ChangePosType& type, bool& result); 
						
						
					 
					
						2016-03-27 10:40:13 +03:00  
					
					
						 
						
						
							
							
							 
							
							
							
							
							 
						
					 
				 
			
				
					
						
							
							
								 
								newsages 
							
						 
					 
					
						
						
							
						
						598d4f10ed 
					 
					
						
						
							
							Change to subforder project model.  
						
						 
						
						
						
						
					 
					
						2016-03-21 02:12:30 +01:00