Merge branch 'master' of https://github.com/worklist/hifi into edit_particles

This commit is contained in:
ZappoMan 2013-12-12 15:59:34 -08:00
commit 21bdbe3128

View file

@ -24,11 +24,6 @@ int main(int argc, const char * argv[]) {
timeval startup_time;
gettimeofday(&startup_time, NULL);
#if defined(Q_OS_MAC)
const QString QT_RELEASE_PLUGIN_PATH = "/usr/local/lib/qt5/plugins";
QCoreApplication::addLibraryPath(QT_RELEASE_PLUGIN_PATH);
#endif
int exitCode;
{
Application app(argc, const_cast<char**>(argv), startup_time);