Merge branch 'experimental' of git://cockatrice.git.sourceforge.net/gitroot/cockatrice/cockatrice

cockatrice/cockatrice.pro

 TEMPLATE = app
-TARGET =
+TARGET = cockatrice
 DEPENDPATH += . src ../common
 INCLUDEPATH += . src ../common
 MOC_DIR = build
@@ -202,6 +202,6 @@ win32 {
 }
 macx {
 	ICON = resources/appicon.icns
-	CONFIG += x86 ppc
+	CONFIG += x86_64 release
 	LIBS += -bind_at_load
 }

cockatrice/src/carddatabase.cpp

@@ -238,7 +238,7 @@ void PictureLoadingThread::run()
 	pictureLoader->setPicsPath(picsPath);
 	pictureLoader->setPicDownload(picDownload);
 	
-	usleep(100);
+	usleep(10000);
 	initWaitCondition.wakeAll();
 	
 	exec();

cockatrice/src/main.cpp

@@ -73,11 +73,11 @@ int main(int argc, char *argv[])
 #ifdef Q_OS_MAC
 	QDir baseDir(app.applicationDirPath());
 	baseDir.cdUp();
+	baseDir.cdUp();
+	baseDir.cdUp();
 	QDir pluginsDir = baseDir;
 	pluginsDir.cd("PlugIns");
 	app.addLibraryPath(pluginsDir.absolutePath());
-	baseDir.cdUp();
-	baseDir.cdUp();
 #endif
 #ifdef Q_OS_WIN
 	app.addLibraryPath(app.applicationDirPath() + "/plugins");
@@ -116,7 +116,9 @@ int main(int argc, char *argv[])
 	}
 	
 	if (startMainProgram) {
+		qDebug("main(): starting main program");
 		soundEngine = new SoundEngine;
+		qDebug("main(): SoundEngine constructor finished");
 
 		MainWindow ui;
 		qDebug("main(): MainWindow constructor finished");
@@ -130,6 +132,7 @@ int main(int argc, char *argv[])
 		app.exec();
 	}
 	
+	qDebug("Event loop finished, terminating...");
 	delete db;
 	delete settingsCache;
 	delete rng;

cockatrice/src/window_deckeditor.cpp

@@ -395,7 +395,7 @@ void WndDeckEditor::actPrintDeck()
 
 void WndDeckEditor::actEditSets()
 {
-	WndSets *w = new WndSets(this);
+	WndSets *w = new WndSets;
 	w->setWindowModality(Qt::WindowModal);
 	w->show();
 }

oracle/oracle.pro

@@ -10,6 +10,7 @@ HEADERS += src/oracleimporter.h src/window_main.h ../cockatrice/src/carddatabase
 SOURCES += src/main.cpp src/oracleimporter.cpp src/window_main.cpp ../cockatrice/src/carddatabase.cpp ../cockatrice/src/settingscache.cpp
 
 macx {
-	CONFIG += x86 ppc
+#	CONFIG += x86 ppc
+CONFIG += x86_64 release
 	LIBS += -bind_at_load
 }