Skycoder42
					
					7 years ago
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 8E01AD9EF0578D2B
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
6 additions and 
4 deletions
			 
			
		 
		
			
				- 
					
					
					 
					tests/auto/mvvmcore/serviceregistry/tst_serviceregistry.cpp
				
 
			
				- 
					
					
					 
					tests/auto/mvvmcore/serviceregistrytestplugin/serviceregistrytestplugin.pro
				
 
			
		
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -163,10 +163,12 @@ void ServiceRegistryTest::testPluginRegistration() | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.so"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#elif defined(Q_OS_DARWIN) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dylib"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin_debug.dylib"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#elif defined(Q_OS_WIN) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugin.dll"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/libserviceregistry_testplugind.dll"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#ifdef QT_NO_DEBUG | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugin.dll"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#else | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							QVERIFY(QFile::exists(QStringLiteral(PLUGIN_TESTDIR "/serviceregistry/serviceregistry_testplugind.dll"))); | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#endif | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					#endif | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
							qputenv("QT_PLUGIN_PATH", PLUGIN_TESTDIR); | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  | 
				
			
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					| 
						
						
							
								
							
						
						
					 | 
				
				 | 
				
					@ -5,7 +5,7 @@ QT = core mvvmcore | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					load(qt_build_paths) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					TARGET = serviceregistry_testplugin | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					TARGET = $$qtLibraryTarget(serviceregistry_testplugin) | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					DESTDIR = $$MODULE_BASE_OUTDIR/tests/plugins/serviceregistry | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					
 | 
				
			
			
		
	
		
			
				
					 | 
					 | 
				
				 | 
				
					HEADERS += \ | 
				
			
			
		
	
	
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
				
				 | 
				
					
  |