Changeset 1787049


Ignore:
Timestamp:
12/24/14 05:50:49 (5 months ago)
Author:
Ken Moore <ken@…>
Branches:
master, enter/10, releng/10.1.1, releng/10.1.2
Children:
8d89055
Parents:
6725dfa (diff), 729d03c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' of github.com:pcbsd/pcbsd

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • build-files/conf/port-make.conf

    rad3721c r729d03c  
    6565dovecot_SET=MYSQL PGSQL SQLITE LDAP 
    6666easytag_SET=WAVEPACK 
    67 ffmpeg_SET=X11GRAB 
     67ffmpeg_SET=X11GRAB SDL 
    6868freeciv_SET=SDL 
    6969freetype2_SET=LCD_FILTERING 
  • src-sh/syscache/daemon/DB.h

    rd693394a r6725dfa  
    8484        ~DB(); 
    8585 
    86         void startSync(); 
     86 
    8787        void shutDown(); 
    8888 
    8989        QString fetchInfo(QStringList request); 
    9090        //Request Format: [<type>, <cmd1>, <cmd2>, .... ] 
     91 
     92public slots: 
     93        void startSync(); 
    9194 
    9295private: 
  • src-sh/syscache/daemon/daemon.pro

    re1b3a9e r6725dfa  
    2121 
    2222QMAKE_LIBDIR = /usr/local/lib/qt5 /usr/local/lib 
     23LIBS += -L/usr/local/lib 
  • src-sh/syscache/daemon/syscache-daemon.cpp

    r577fa72 r6725dfa  
    77    connect(server, SIGNAL(newConnection()), this, SLOT(checkForConnections())); 
    88  DATA = new DB(this); 
    9     DATA->startSync(); 
     9    QTimer::singleShot(60000, DATA, SLOT(startSync()) ); //wait one minute to start the initial sync 
    1010} 
    1111 
Note: See TracChangeset for help on using the changeset viewer.