merge commit
authorStuart Parmenter <pavlov@pavlov.net>
Sun, 20 Apr 2008 04:31:15 -0700
changeset 16896 f8970ec5950647cf1e23f46d76929b76cd926380
parent 16895 9294bb61588612bfa15985f425a90d4c9bf475b7 (current diff)
parent 16893 0e4eb7adb45ab7440d42ef19d39b6ce6ab8406c8 (diff)
child 16897 c084dd0a583df49ca7e4a5ac38f4c4b236d8cf03
push idunknown
push userunknown
push dateunknown
milestone2.0a1pre
merge commit
--- a/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
+++ b/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
@@ -1,24 +1,31 @@
 #include <qapplication.h>
 #include "mainwindow.h"
 #include "qgeckoembed.h"
 #include "nsXPCOMGlue.h"
+#ifdef MOZ_JPROF
+#include "jprof/jprof.h"
+#endif
 
 #include <qdir.h>
 
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
     static const GREVersionRange greVersion = {
         "1.9a", PR_TRUE,
         "2", PR_TRUE
     };
 
+#ifdef MOZ_JPROF
+    setupProfilingStuff();
+#endif
+
     char xpcomPath[PATH_MAX];
 
     nsresult rv = GRE_GetGREPathWithProperties(&greVersion, 1, nsnull, 0,
                   xpcomPath, sizeof(xpcomPath));
     if (NS_FAILED(rv)) {
         fprintf(stderr, "Couldn't find a compatible GRE.\n");
         return 1;
     }